Restructured .vimrc file a bit