Upgrade from Rails 3.2 to Rails 4.1
Update code to work with turbolinks and spring
Add example secrets.yml file
Tweak .gitignore
Fix controller bugs
Fix merge conflicts