Namespaces fixed, merge-resources passing its tests.
Merge pull request #1 from tsleyson/fixns

Namespaces fixed, merge-resources passing its tests.