Merge pull request #130 from jasnow/master

Updated 7 gems by rebuilding Gemfile.lock file
Merge pull request #131 from jasnow/master

Upgraded 4 gems by rebuilding Gemfile.lock file
New 2.1.2 branch changes for Ruby 2.1.2 upgrade
Merge branch 'pr-132'