Added git hash for mailcatcher to stop it defaulting to a none existent version
Added proper version number
Merge branch 'dev' of github.com:mikebell/drupaldev-nginx into dev

Conflicts:
	Puppetfile