adverbs and conjunctions marked through decorators

rather than in a centralized place (vocabulary.coffee)
rm unused mechanism for overriding scalar behaviour
Merge remote-tracking branch 'origin/master' into gh-pages
built demo