Major reorganization of ALL vimrc files
testing stuff
fixed tmp-discovery
Merge branch 'dev'