Apply neobundle#tap to submode-mappings
Merge branch 'master' into mac