views/contacts/new.html.erb -> new.html.haml
/contact-us only shows errors.full_messages if any?
contact form: tweak html5 placeholder text
contact form: replace phone number with subject
Contact email Subject: and From: fields

Are populated from the corresponding fields in the form.
contact.text.erb -> contact.text.haml
/contact-us map appears below 'send us an email'