update gneral settings
Merge branch 'master' of github.com:gilligan/.vim

* 'master' of github.com:gilligan/.vim:
  fix c-space in console
  update settings ...
  update mapping