master in stacco-0.1.21

- old
+ new

@@ -1,2 +1,3 @@
 0000000000000000000000000000000000000000 43266d16742cc444c81d82f49923f99546bf6702 Levi Aul <levi@leviaul.com> 1402508203 -0700	clone: from git@github.com:bexio/cloudformation.git
 43266d16742cc444c81d82f49923f99546bf6702 7ae0507874a426eccf1e5cade20bbd06e748026a Levi Aul <levi@leviaul.com> 1402598788 -0700	commit: Merge Bastion and NAT functions, and move DockerHost to using upstart
+7ae0507874a426eccf1e5cade20bbd06e748026a 016915ad73dd873159f7f9c9f386eb833f683854 Levi Aul <levi@leviaul.com> 1402619504 -0700	commit: Externalize DockerHost logic