Upgraded to Rails 4.0
Merge pull request #6 from jdjkelly/feature/rails_4.0

Upgraded to Rails 4.0