begin tokenization rework
Merge branch 'master' of github.com:hltcoe/rebar into riak