stole some of alexs vimrc
Merge branch 'master' of https://github.com/jplace/setup-computer