right suffixes
default test is held out
enable selecting secondary
Merge branch 'master' of github.com:flammie/autostuff-moses-smt