Eliminated merchant_selection from users controller.
Deleted controller, need to replace javascript
Geolocation java/coffeescript now in listeners script file