Fixed config generation for devrel.
Updated schema to be more first user friendly.
Merge branch 'test' into dev