Also report best_iter + 1 as best iteration
Fix output of modified script.
Revert change that should not have been committed
Merge pull request #20 from lisa-lab/fix_iter_index

Further fixes following gh-19