define search categories and list orders
beautiful indented representations of constants
Merge branch 'master' into constants
fix CRLF
docstrings added
crlf correction
Merge branch 'constants'

Conflicts:
	tpb/tpb.py
uppercase constants