not much
Merge branch 'master' of https://github.com/dfm/exopop

Conflicts:
	document/code/main.py
plots, etc