Simplified gemspec
Rewrote gemfile
Reindent gemspec
Added airbrake
Bump version for next release
Merge from master