bleh
Merge branch 'master' of github.com-aparato:aparato/vim_conf

Some stuff
I don't really know