Updates
Merge branch 'master' of https://github.com/walshc/radios-benin

Conflicts:
	estimation/forwardsim.R
	estimation/forwardsim.c