adapt terms to grammar
fix Haskell statements
Orig Haskell tbl
fix some bugs for layout-sensitive sequences
complain about correct index
Merge branch 'master' into plugin

Conflicts:
	.gitignore