don't make loading an assertion, just try waiting for it
bump firefox on travis
Merge pull request #5152 from jhass/stabilize_cukes

Try stabilizing cukes
drop useless require from script/get_config.rb [ci skip]
Update to Rails 4.1
Merge pull request #5159 from jhass/rails41

Update to Rails 4.1
Merge branch 'develop' into issue_5149

Conflicts:
	spec/controllers/aspects_controller_spec.rb
	spec/controllers/conversations_controller_spec.rb
	spec/controllers/people_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/integration/receiving_spec.rb
	spec/lib/postzord/receiver/public_spec.rb
	spec/models/post_spec.rb
	spec/models/user/querying_spec.rb