gem update
Spec fix
Merge branch 'gems'

* gems:
  Spec fix
  gem update

Conflicts:
	Gemfile.lock
Fixed procfile
Added timeout to loading contributors and org members on startup
More spec 3 upgrade changes
Removed the HNlike button, fixes #619
Fixed ghbtns.com counts after repo move
Renamed Gittip to Gratipay
Updated badges
Updated dependencies
Merge pull request #621 from 24pullrequests/gratipay

Renamed Gittip to Gratipay
more gem updates
Remove trailing lines in file.
Keep a blank line before and after keyword protected.
Add a space after comma.
Add spaces around + and - operators.
even more gem updates
Merge pull request #623 from toch/fix-style-issues

Fix style issues
gem updates