Add timeclock aliases.

Also add git global commit of 'simple'.  Add debug flag for active
merchant.