Clear html if resubmit invalid
Remove call to Google Maps API, some cleanup
Merge branch 'master' into gh-pages