inherit base/default and type/default
Add siteID to inheritance check
Merge branch 'humbucker' of git://github.com/blueriver/MuraCMS into humbucker