Merge branch 'develop'
coveralls token
more rubies on travis
1.8.7 is eol'd, so take it back off; mime-types won't bundle with it...
bad space in coveralls config
merge dev
badges