Major strip and tidy.
Reshuffle.
Merge branch 'v2tt6' of github.com:invertedtomato/ChERP into v2tt6
Improved messages.
Merge branch 'v2tt6' of github.com:invertedtomato/ChERP into v2tt6