consolidate gvimrc into vimrc

vim/gvimrc.symlink

@@ -1,9 +0,0 @@
-" set font and colorscheme
-colorscheme smyck
-set guifont=*
-set guifont=Inconsolata:h14
-
-" hide the toolbar in MacVim
-if has("gui_running")
-    set guioptions=egmrt
-endif

vim/vimrc.symlink

@@ -297,4 +297,11 @@ let g:ctrlp_working_path_mode = 2
 let g:airline_powerline_fonts=1
 let g:airline_theme='dark'
 
+if (has("gui_running"))
+    set guioptions=egmrt
+    let g:airline_left_sep=''
+    let g:airline_right_sep=''
+    let g:airline_powerline_fonts=0
+endif
+
 let vimrc_already_sourced = 1