catch up on the make files also.

Much of the commits have gone to the commerce branch. This is an attempt
to have the master branch in sync with the commerce branch.