begin tokenization refactoring
additional tokenization updates; added whitespace test
further tokenization updates
Merge branch 'master' of github.com:hltcoe/rebar into riak
messy commit for rollback purposes
messy refactoring complete