Rollup of changes: Fixes #66, fixes #77, fixes #85
Merge branch 'master' of github.com:requirejs/text