Add support for /config
Merge branch 'upstream-master' into rrbrambley-master

Conflicts:
	ADNKit.xcodeproj/project.pbxproj
Merge branch 'upstream-master'