adds error on "-s" option
repairs unit tests
Merge branch 'master' into fix_rates

Conflicts:
	tests/test_forest.cc
	tests/test_param.cc