Most found bugs have been killed, most recent: conflicted satisfied differing types changing html bug now works
Warning box now not visible before document ready
Merge pull request #110 from Ian-Stewart-Binks/conflicts-sat-fixes

Conflicts sat fixes. Fixes #86. Fixes #107. Fixes #108.