Upgrade to Ruby 2.1.4
Merge pull request #878 from stomar/upgrade-to-2-1-4

Upgrade to Ruby 2.1.4