mixing mapping collisions
Merge branch 'master' of github.com:drio/dotfiles