Remove filler text
Merge and delete plain html files
Add mandrill keys
Add host param for email
change from in registration mailer
Merge branch 'master' into release-1