rails 3.2.1
converted to rails
removed my maps api key
merge