Updated vimrc settings
Better variable names
Merge pull request #2 from FenrirUnbound/dev

Misc Fixes