no message
Merge branch 'master' of https://github.com/majdal/modex

Conflicts:
	src/frontend/components/PlayPause.js
Merge branch 'master' of https://github.com/majdal/modex
Restored the farms layer. Sorry, Nick!
Tweaked eutopia to be a little less Green initially
Added "follow society" factor

Makes farmers more likely to do what everyone else is doing.  This adds
a bit of history to the model, meaning that changes will become more
gradual.
Added bias towards doing what your neighbours are doing

Note: this does slow down the simulation a bit, but it leads to
some nice dynamics in behaviour.  If it's too slow with this change,
set "follow_local" to 0.
scratch out two rough drafts of this API
getting closer!
Less sure about the goal for this now..
Merge branch 'master' of https://github.com/majdal/modex
refinements
minimal test example to try to convince Tavendo to not force ports on WebSocketServerFactories
Checked for matplotlib not being installed
clarity for people unfamiliar with scipy
Merge branch 'master' of https://github.com/majdal/modex
Cruft I didn't use
That was way too fast.
tidy comments to make my goals clearer
Add and tweak Team Guidelines