Separate out layer parsing/building.
Merge branch 'master' of github.com:iskandr/striate