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

* 'master' of https://github.com/gilligan/.vim:
  add plugins