Use ruby 2.1.1 and rails 4.1.0
Update Gemfile.lock
Merge pull request #64 from calblueprint/version-updates

Version updates
Merge conflicts