pyenv again
ugh subversion
Merge remote-tracking branch 'origin/master' into ccap
Revert "no more special for scala"

This reverts commit 8aec38cf1aefde68546f94c6f3c228280ac55578.
update vim scala