Fix a log message in Location
Install factory_girl_rails
Use Factory Girl to replace the Location fixtures with a factory
Merge branch 'factory-girl' into ice-cube-and-factory-girl

Conflicts:
	app/models/location.rb
	test/fixtures/locations.yml
Remove custom scripts from the Travis config
Merge branch 'master' into ice-cube-and-factory-girl
Don't require factory_girl_rails in the Gemfile