merged master into local
Lots of changes... mostly implementing course options on both the course and discussion level. These aren't well tested, but just dropping the loaded options into the already paramaterized defaults seems to work pretty nicely.
Also removed some Network mentions as it was causing errors in a couple of places.