Merge pull request #640 from jasnow/master

Upgraded Ruby to 2.1.4 and upgraded 1 gem.
Merge branch 'master' of https://github.com/andrew/24pullrequests