Refactor and clean up vim config.

(Remove old config files, try to clean up .vimrc a  *little*)
Merge branch 'master' of github.com:mjkelly/config