misc dotfile changes (shazam)
Merge branch 'master' into tempbranch