fixed some warnings
minor addition to booleans:simplify
Merge branch 'master' of github.com:cwi-swat/rascal