Upgrade Ruby to 2.1.5
Rails upgrade to 4.1

Minimal working changes.
Merge branch 'master' into staging
Merge pull request #7 from nembrotorg/staging

Staging