minus muscle memory mappings
Merge branch 'master' of github.com:nathanl/.dotfiles