fixed some strange whitespace parsing issues.
Merge branch 'master' of https://github.com/GlitchLich/Panopticon
improving whitespace stuff