Streamlining and simplification of layer builder.
Merge pull request #95 from chuckdumont/master

Streamlining and simplification of layer builder.