2nd go at heroku
Merge branch 'master' into heroku

Conflicts:
	app/controllers/application_controller.rb
	config/initializers/geocoder.rb
Merge pull request #29 from jjlee5266/heroku

2nd go at heroku