Merge pull request #286 from gvwilson/master

Pulling in work on instructor's guide
Fixing broken link to FAQ