Sort vimrc setttings
Remove commented mapping
Merge branch 'onmac'