mapping changes
Merge branch 'master' of github.com:rafaels88/vim