define search categories and list orders
beautiful indented representations of constants
Merge branch 'master' into constants
fix CRLF
Merge branch 'constants' into pyquery

Conflicts:
	tpb/tpb.py