Updated links now that stuff is forked to pchen. And Tessa seemed to have changed her github handle.
Merge branch 'refs/heads/edmonton'
Merge branch 'refs/heads/master' into gh-pages