7.x 3.x instructors

#Ready for review

@cjwest or @jbickar please have a look at this pull request. It looks good to me but I could use a second set of eyes.