don't globally ignore rbenv/rvm versions in git
Merge branch 'master' into ccap