Catch up the repo with current settings#1

aaronthebaron wants to merge 1 commit intomasteraaronthebaron/devsetup:masterfrom

newishaaronthebaron/devsetup:newishCopy head branch name to clipboard