Quite a few vimrc updates
Added some vimrc magic and some minor bash config updates