Don't duplicate shims in PATH
tests for rbenv-init
Merge remote-tracking branch 'sstephenson/master'