Change About contents, clean up merge
Add email to contact us