Update dependencies
Update dependencies
Uninstall New Relic monitoring
Use dictionary lists to display location hours
Use Thin as the web server
Remove some extra gems
Update rubocop config
Minor code style fix
Remove leftover options for turbolinks
Update Bootstrap
Merge branch 'master' into factory-girl

Conflicts:
	Gemfile.lock