stuff
Merge branch 'master' of github.com:jrnold/mcmcdb

Conflicts:
	R/parameter-parsers.R