rearranged command in vimrc
cleaned up vimrc
stole some more gary bernhardt goodness for my vimrc <3