removing mention of Vagrant from docs (perhaps will re-add later)
Merge remote-tracking branch 'origin/master'

Conflicts:
	docs/example_app.rst