Add info on token tooltips, move to 1.2-dev
Merge pull request #77 from parrt/master

Add info on token tooltips, move to 1.2-dev