Upgrade to Rails 4
Temporarily stubbing Lint testing
Merge branch 'develop'