Test commit: checking that I can use git properly.
Merge branch 'add-vagrant' of https://github.com/denised/h into add-vagrant

Conflicts:
	Vagrantfile