Added osx back in
Merge branch 'master' into mac-os-x
Added Home and End key mappings for vim
merging master into mac-os-x, 1 minor conflict
Merge branch 'master' into mac-os-x
Merge branch 'master' into mac-os-x
tag vim map