Manta <-> Master branch syncronization.
Merged in laptop's my_unix_customizations
Pull merge with what's now on github.

Merge github.com:perlygatekeeper/my_unix_customizations