added auto-config#2

apotheon wants to merge 11 commits intoscottjad:masterscottjad/cons:masterfrom

apotheon:masterapotheon/cons:masterCopy head branch name to clipboard