Modify vim-setup.sh

Special thanks;
  https://twitter.com/tsx/status/485631856625209345
Remove configure options for gnome2
Merge branch 'vim'