Added cumulative arrays (content_types, path, response_codes)
Fix includes - Psych was clearing out the !include
Deep merge traits and resourceTypes instead of recursively applying them