commit a bunch of things that didn't get committed
Merge branch 'master' of https://github.com/bosgood/chi-text