pulling in changes from master to my own branch

Hopefully.

So I can add the changes I've made locally (mostly to model_make and a tiny bit to jsr5_processing) into the knowledge/ folder (no longer working in /knowledge/prototype).

Just want to make sure I'm pulling master into my branch, not the other way around.