++version
(whitespace)
Update build.sh to use version in zipfile-name and switch entities before/after running
Add a media fixture
Refactor entities
Rework the tokenize entity as tokenizeOtions
Add fixture for options
Extract options test to separate XSpec file
Merge branch 'master' into test-new-builder

Conflicts:
	build.sh
	src/version.ent

Resolved cleanly
Add revision info to README
Merge pull request #10 from greystate/new-builder

New builder