vim scrim
rolled back
fixed merge issues with .bashrc
working on .vim merge issues
more merging
cleanup