Some cleanup on .vimrc (remove unused settings, fix indentation, etc)