Merge pull request #2 from omnisis/master

Fixes and support for 'tokens' and 'options' directives
Removed .JSON-tmLanguage file that was mistakenly committed