Tidy.
Merge branch 'v2tt6' of github.com:invertedtomato/ChERP into v2tt6