bump recommended rubygems version
Merge branch 'develop' of github.com:diaspora/diaspora into develop