Merge pull request #105 from jasnow/master

Rebuilt Gemfile.lock file. Upgraded 2 gems.
Did git pull parent master in master, then merged that in