rebase with matts config
updated to the latest vimrc setup
Merge pull request #8 from toranb/master

updated to fix the comma comma shortcut