some alias changes
Merge branch 'master' of github.com:mmadrid/dots