Docker and vagrant now work in harmony. Some refactorings for Ash's comments
Merge branch 'master' of github.com:opentable/hobknob
Merge pull request #14 from christriddle/master

Docker and vagrant now work in harmony. Some refactorings for Ash's comm...