added hard coded production database name
Upgraded app to rails 4.1

Conflicts:
	Gemfile
	app/models/weather.rb
	config/database.yml
Merge branch 'upgrade-to-rails-4.1'