Merge branch 'master' of http://pages.cs.wisc.edu/~kritphon/git/cs736

Conflicts:
	Makefile
keywords now works

usage: <fe> <top> <be> <filter> <keyword1> <keyword2> <keyword3> ....