Edits and email tests
Merge branch 'master' of https://github.com/cestridge/ammc

Conflicts:
	contactengine.php
Fixing Conflicts