Standardize on config/platform for output dir
omg crlf
Merge branch 'master' into omfg-crlf

Conflicts:
	workspace/ext_server_incognito/ext_server_incognito.vcxproj
omg crlf