Update mappings on Vim. Export iTerm2 preferences
Merge master