Fixes from production for shipyard & docker
Merge branch 'master' of https://github.com/soumentrivedi/ansible-docker-roles

Conflicts:
	Vagrantfile
	group_vars/all