Merge pull request #33 from red-admirals-2014/mailer

most up to date with start of contact function and map stuff
Can now see form and send email from form
Merge branch 'master' into mailer
Checking for merge conflicts before making pull request.