conditionals still broken: added relational funcs
demonstrate function undefined error
Merge branch 'conditionals' of github.com:puconghan/plt into conditionals

Conflicts:
	epicparser.py
	parsingrules.py