Fix failing tests
travis
Just use local data
Need to load dependencies explicitly for production
Merge branch 'master' into rails4

Conflicts:
	Gemfile.lock
	config/environments/production.rb