[Pull me in fifth]Rails 4.1

This builds on previous PRs that are still pending.

Staged here:

https://mapmarkers.herokuapp.com/