This is a partly fix for issue #72. Gradient overlays need more fixing.
init only running as a plugin
Merge branch 'master' into generator-assets
Fix two issues with previous commit where we didn't even enter the new code path.
Merge branch 'master' into generator-assets