Lots of changes; templates still in testing
More updates
Merge pull request #2 from ksuarz/vimrc-testing

Merge vimrc-testing into master