rails new rails-starter -d postgresql -T (4.1.4)
Merge branch 'rails-new'

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
	config/database.yml
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
Merge branch 'master' into bootstrap
Remove secrets.yml in favor of pre-4.1 method
Add spring support for guard-rspec
Ensure test DB is migrated in Rails 4.1
Merge branch 'master' into bootstrap
Disable minification for faster deploys
Add missing rspec binary for spring rspec support
Merge branch 'master' into bootstrap