Attempt for travis in 1.8 ruby
Merge branch 'travis-1.8-rake' into small-fixes

* travis-1.8-rake:
  Attempt for travis in 1.8 ruby