use rbenv instead of rvm, updated gems, tidy-up