Cleaned up .vimrc more, realigned statusline