bugfix
start becomes generic
resolve conflict

Merge branch 'master' of https://github.com/hughjonesd/betr

Conflicts:
	R/stages.R