Remove commented out code, and document my changes.

Also change merfolk fighter -> merfolk in the database.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5374 c06c8d41-db1a-0410-9941-cceddc491573

Created by  j-p-e-g  on May 31, 2008
UWA77ZXA34J6UHPHAMFCCMP2OIPRIMGXYTEPXUU53FIRK3GZBL4QC
Change contents