cleanup after horrible merge
Merge branch 'develop' of git://github.com/magento-hackathon/AttributeConfigurator into develop