Commit [9e9324] Maximize Restore History

Resolve merge conflict in src/solve.lisp and commit result of git pull.

Robert Dodier Robert Dodier 2013-12-05