Rearrange and add good .vimrc stuff