update gems
use rspec expect() syntax
simplify travis build
remove gemset file

seems to be causing installation failures on travis
cache bundled gems
Merge remote-tracking branch 'origin/master' into update-gems
Merge pull request #37 from afeld/update-gems

update gems