Update README.md
input data for cakemap and 2 more glossary items
Merge branch 'master' of github.com:Robinlovelace/smsim-course
Merge remote-tracking branch 'upstream/master'