Added vim-airline and moved things around a bit