Rails 2.3.17

Also update TOC test for
new Maruku TOC code.
Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki