Added two types to help the typechecker
Added import of Exception.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git
Added missing imports