Removing some unnecessary uses of 'return'
Updating gemspec/Gemfile for 1.8.7 compatibility