Merge namespace and nodetype definitions

definitions:
  namespace:
    hippo:
      uri: http://www.onehippo.org/jcr/hippo/nt/2.0.4
      cnd: hippo.cnd
    hippofacnav:
      uri: http://www.onehippo.org/jcr/hippofacnav/nt/1.0.1
      cnd: hippofacnav.cnd