12/14/13 update
Merge branch 'master' of github.com:nikklassen/Vim