Cleanup and vim spellcheck
bashrc merge conflict. cleanup nerdtree