test commit
updated bashrc in osx to look like master.
Merged in changes from HPCC configs
Added fonts, screenrc, and colors from master
Modified the install file so that it will correctly link _vim and _fonts, but now it's not portable.  TODO: fix this
Added a thesaurus to vim
Modified the install file so that it will correctly link _vim and _fonts, but now it's not portable.  TODO: fix this
Uh... These are still showing up.
Added a thesaurus to vim
Merge branch 'hpcc'
Removed _bashrc_local which is only for the deployed branches (not master)
Merged from remote
Pulling the remote changes to master
Merged master to osx
Undoing an accidental pull from osx