Improved error messages
Merge branch 'master' of https://github.com/sjolsen/compiler
Modified token predicates to give better error location information