Merge pull request #73 from kergoth/layer-updates

Adjust for upstream layer updates
This commit is contained in:
Christopher Larson
2015-06-19 12:37:41 -07:00