set up contact form mailer to codegain.us accts
Merge branch 'master' of git://github.com/kaghaffa/codegain

Conflicts:
	log/development.log