Update docker and vagrant to use python-obelisk pip package
Merge branch 'master' into vagrant_obelisk

Conflicts:
	Vagrantfile
Merge pull request #166 from dionyziz/vagrant_obelisk

Vagrant obelisk