Make tableau_expand more efficient.

Determine type of each forumla only once.
Represent types as canonical formulas (i.e.,
all alpha formulas are 'and' formulas).
Merge branch 'master' of github.com:winobes/modal-logic

Conflicts:
	logic/pred.py