Merge pull request #161 from engineyard/CC-674

Re-factor Magento