dynamically detect conflicts; add support for <li>
update version number
Merge pull request #11 from redmunds/randy/list-support

Add <li> support