Combine admin and instructor roles.
Merge pull request #28 from atsheehan/combine_instructor_admin

Combine admin and instructor roles.