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

* 'MB1' of https://github.com/ldstudio-ca/dotfiles:
  Files from last cm
Merge branch 'master' of https://github.com/ldstudio-ca/dotfiles

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