Merge branch 'master' into develop
Merge any other changes into develop
Removed extraneous whitespace
Removed more extraneous spaces
Changed return symbols to all caps
Changed symbols that represent constants to *-strings
Fixed the tests, now gen-utf* generators are tied to procedure names instead of #f
Merge branch 'develop'
Added fixes to tests, removed extraneous spaces, fixed some
generator bugs regarding how procedure names are handled.