Reorder some functions to group them

Predicates now match the order they are documented on the wiki
Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite