Synching things up between copies
Merge branch 'master' of https://github.com/tjhladish/AbcSmc

Conflicts:
	dengue_test/abc_config.json
Experimental/temp fix for mpi fork problem