Merge branch '7.x-2.x' into travis
Merge branch 'travis' of https://github.com/lsolesen/commerce_kickstart into travis