Start segmenting out OSX vs Ubuntu config files. Simplify vimrc.