Magento 1.8.0.0

@danmcp Please review and merge