Superficial changes to command line interface
Merge branch 'master' of github.com:tjhladish/AbcSmc

Conflicts:
	examples/dice_game.cpp