Upgrade to Rails 4 and changes to ap
Merge pull request #1 from mcollie1/rails-up-and-app-modifications

Upgrade to Rails 4 and changes to ap