update
Merge branch 'master' of https://github.com/yyk/vimsettings-2013
update