Updated branches in preparation for merge and new release

Author: migurski

circle.yml

@@ -17,7 +17,7 @@ test:
 
 deployment:
   hub:
-    branch: [migurski/docker-docker-docker]
+    branch: [master, migurski/docker-docker-docker]
     commands:
       - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
       - docker tag openaddr/prereqs:`cut -f1 -d. openaddr/VERSION`.x openaddr/prereqs:`cat openaddr/VERSION`