Merge branch 'moar_efficient' of github.com:jirafe/magento-extension into moar_efficient