Issue #80: Fix sublayer renderer issue caused when layer has no sublayers.
Clean up.
Clean up imports.
Merge branch '#80/fix-sublayer-renderer-issue' into develop