Maruku's HTML parsing is really grotty
Merge branch 'master' of github.com:bhollis/maruku
Merge branch 'master' of github.com:bhollis/maruku
Merge branch 'master' of github.com:bhollis/maruku
Merge branch 'master' of github.com:bhollis/maruku

Conflicts:
	lib/maruku/input/html_helper.rb
Merge branch 'nokogiri'
Restore defaults
Merge pull request #81 from bprescott/improved_tables

Improved tables
Merge branch 'master' of github.com:bhollis/maruku
Another list+IAL test
Restore defaults