Changed to Vundle for vim, and small i3 changes.