fix virtualenvwrapper
Merge branch 'master' of github.com:kashewnuts/dotfiles
Merge branch 'master' of github.com:kashewnuts/dotfiles
add scala settings
add vim-watchdogs