Revert "quick commit 2014-07-04 14:57:04"

This reverts commit 70e97acd14dbab0c1fc35fdeb65052a05f8cf7e6.

revert to changes before implementing geolocation api
Revert "Revert "quick commit 2014-07-04 14:57:04""

This reverts commit 21eece2ce3db6a6472d29160399d672308a73c64.

that was not what I intended to do...
Merge branch 'nogps' of github.com:CodeForPortland/trailheadit
Merge branch 'nogps'
fix haml views
rewrite no-gps mailer and turn geolocate into button