Several jj bugfixes
Merge branch 'master' of github.com:chuka/koan-lang

Conflicts:
	src/main/javacc/koan.jj