Merge pull request #12 from vholland/master

Renamed actions per public-vocabs discussion; Added EmployeeRole (3rd time's a charm)
Changed title.
Revert "Renamed actions per public-vocabs discussion; Added EmployeeRole (3rd time's a charm)"
Merge pull request #13 from danbri/revert-12-master

Revert "Renamed actions per public-vocabs discussion; Added EmployeeRole...
Revert "Revert "Renamed actions per public-vocabs discussion; Added EmployeeRole..."
Merge pull request #14 from danbri/revert-13-revert-12-master

Revert "Revert "Renamed actions per public-vocabs discussion; Added Empl...
Merge pull request #10 from danbri/master

Syncing from Dan's repository