corking, and a major refactor to accomodate it

include/bottles.hpp

@@ -38,7 +38,15 @@ namespace cellar {
                 string get_config(string);
                 bool set_config(string, string);
         };
+        
+        extern Bottle active_bottle;
+    
 		extern map<string, Bottle> get_bottles();
+        extern string resolve_bottle(string);
+
+        extern void cork(string, bool);
+        extern void press(string, vector<string>, bool);
+        extern void uncork(string);
 	}
 }
 

include/cellar.hpp

@@ -11,8 +11,6 @@ using namespace std;
 namespace cellar {
     extern void print_header();
 
-    extern bottles::Bottle active_bottle;
-    
     extern bool dryrun;
     extern bool verbose;
 }

include/internal/launch.hpp.cog

@@ -13,6 +13,7 @@ using namespace cellar::commands;
 namespace cellar {
     namespace launch {
         extern void popen(string);
+        extern void popen(vector<string>);
 
     /*[[[cog
          import cog