Fixed scanner errors and test scanner
Merge branch 'master' of https://github.com/r2d32/GollumScript