save model options and no need to specify it during testing; split hill-climbing iteration option into two for training and testing
Merge remote-tracking branch 'origin/master' into new_update