Added extra facets to the items
Restructred how facets are included in schema and added new facets
Updated tests.
merging master on to the branch
Updating the tests
Merge pull request #229 from ENCODE-DCC/1314_facets

1314 facets