Add additional invalid example
Add mailing_address, headquarters_address to company schema
Add merged_into to schema
Improved merged_into validation
Add additional officer attributes
Merge branch 'master' into company_schema_improvements

Conflicts:
	spec/sample-data/valid/company-45.json
Merge pull request #8 from openc/company_schema_improvements

Company schema improvements