Upgrade to ruby 2.1
Merge pull request #15 from jamesy829/ruby2.1

Upgrade to ruby 2.1