Merge remote-tracking branch 'origin/master'; commit '019f68a6a17ee129d39c5e0170133ff1d89340a6' into nokogiri

Merge some changes from bhollis on main branch.
I think he's wrong about '_b__c_', though.
Rollback Erroneously "Fixed" Test

This test *should* fail. See
https://github.com/bhollis/maruku/issues/30
Stupid!

Don't just reinstate bogus crap
from previous versions of the tests.
The output should *actually* be ...
IALs for list items were incorrectly parsed

Reported by Andrew Stacey.
Mo better IAL recognition for <li> elements
Merge branch 'fix_nokogiri_switch' of https://github.com/stomar/maruku into nokogiri

Conflicts:
	.travis.yml
	maruku.gemspec
Merge branch 'master' of http://github.com/bhollis/maruku into nokogiri
Merge branch 'master' of http://github.com/bhollis/maruku into nokogiri

Conflicts:
	lib/maruku/string_utils.rb
	maruku.gemspec
Fix parsing of IALs in lists

This seems to have gotten broken
in Hollis's updates. Dunno why --
there were TESTS for it.
Fix Table-of-Content generation

Did this *ever* #$%~ work properly?
Clean up after myself.

Revert unwanted changes from merged Nokogiri branch.