Did a ghetto merge (I don't know git)

Moved vim-lightline branch to here by copy-paste. YOU READ IT HERE FIRST
FOLKS