Merge branch 'master' of https://github.com/ldstudio-ca/dotfiles into MB1

* 'master' of https://github.com/ldstudio-ca/dotfiles:
  Added alias to pull upstream changes
Merge branch 'master' of https://github.com/ldstudio-ca/dotfiles

* 'master' of https://github.com/ldstudio-ca/dotfiles: