Added 5 new Action types for activating devices and the properties contingentOnOffer and notAvailableAtOrFrom.
Merge pull request #5 from danbri/master

Syncing from Dan's repository
Per public-vocabs discussion, renamed OperateAction, notAvailableAtOrFrom, and contingentOnOffer.
Added EmployeeRole and netWorth.
Merge pull request #7 from danbri/master

Syncing from Dan's repository
Merge remote-tracking branch 'origin/sdo-meltingpot'

Conflicts:
	data/schema.rdfa
Merge pull request #12 from vholland/master

Renamed actions per public-vocabs discussion; Added EmployeeRole (3rd time's a charm)