Merge in upstream changes; add some features to vimrc
Update vimrc
Merge yay
Update gitconfig

Fancy new stuff
Edit vimrc, gitconfig, readme; fix templates; rename files; general
improvements
Merge branch 'master' into sauron