Add --finish-rebase to recover from conflicts
Add conflict recovery
Include untracked files in test search
Minor README edits
Fix no tests found message
Fix ignore bug, add test
Version 1.2.1