Merged in cp fixes

diff --combined debian/changelog
index 0b81c24,43fd021..60de897
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- invirt-web (0.1.35) unstable; urgency=low
++invirt-web (0.1.36) unstable; urgency=low
 +
 +  * Punched version.
 +
 + -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:32:57 -0400
 +
- invirt-web (0.1.34) unstable; urgency=low
++invirt-web (0.1.35) unstable; urgency=low
 +
 +  * Added motd to error page and VM info page.
 +
 + -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:31:50 -0400
 +
+ invirt-web (0.1.34) precise; urgency=low
+ 
+   * Use config-package-dev.
+ 
+  -- Alexander Chernyakhovsky <achernya@mit.edu>  Sun, 21 Jul 2013 12:42:40 -0400
++>>>>>>> d7b8e92
+ 
  invirt-web (0.1.33) precise; urgency=low
  
    * Updating version for precise migration.