Gitignore DS_Store [skip CI]
Add setup notes about secret_token.rb
Updated gems
Updated gems
Updated bootstrap-sass gem
Enable Bundler caching
Updated gems
Merge branch 'master' into displays

Conflicts:
	Gemfile.lock