Merge pull request #1 from NPerry/master

Cleaned up cm.mk and fixed it some more for Google Wallet.