minor refactoring to speed up when joining by the empty string
highlighting of names after data without a leading pipe should be treated as typenames, not identifiers.
Merge branch 'master' of github.com:brownplt/pyret-lang