Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Update README.md

Added info on using knitr, and keeping forks up to date
put schedule first, added Alathea's changes
Merge branch 'adletaw-master'