Changes for Rails 3.1
Rails 4 upgrade
Rails 4 upgrade
Fixing merge issues because I didn't switch teh branch