Merging in my vimrc, bashrc and trimming some fat