Merge branch 'master' into lab-machines
Move bins into aliases
Merge branch 'master' into lab-machines
Merge branch 'lab-machines' of https://github.com/davesque/dotfiles into lab-machines