commerce updates
Merge branch '7.x-1.x' of github.com:scotthooker/commerce into 7.x-1.x