updating vagrantfile for tag
upstart script for mailcatcher, over user-based cron
Merge branch 'mailcatcher'
Merge commit '3e0983f971c14719568b810990dce5c0d72b57b1' into theand1404

* commit '3e0983f971c14719568b810990dce5c0d72b57b1':
  upstart script for mailcatcher, over user-based cron
  updating vagrantfile for tag

Conflicts:
	Vagrantfile