Cleanup .vim dir and .vimrc.
Merge pull request #1 from woodyaz/cleanup

Cleanup .vim dir and .vimrc.