moved gvim/macvim specific options to .gvimrc and cleaned up .vimrc a little