Clean up vimrc a tiny bit

tried to put things in groups but then I ended up with only two groups
so...