Re-arranged vimrc more :)