Reorder vimrc, add trailing whitespace plugin