Improved the rule generating system.
Merge remote-tracking branch 'origin/master'

Conflicts:
	vivarana/constants.py