Upgrading to rails 4
Merge pull request #30 from projecttacoma/rails_4_update

Upgrading to rails 4