Removed Docker over TCP changes from bootstrap.py
Clarified what to do with the acceptance testing Vagrantfile
Merge branch 'acceptance-tests-315' of github.com:ClusterHQ/flocker into acceptance-tests-315