Merge branch 'develop'
Remove ruby-head for now, until Travis lets me know what's wrong with it.