Merge pull request #1308 from ovanschie/patch-1

Update for Magento 1.9.1

Author: arcresu

Magento.gitignore

@@ -21,6 +21,7 @@ app/etc/modules/Mage_Bundle.xml
 app/etc/modules/Mage_Captcha.xml
 app/etc/modules/Mage_Centinel.xml
 app/etc/modules/Mage_Compiler.xml
+app/etc/modules/Mage_ConfigurableSwatches.xml
 app/etc/modules/Mage_Connect.xml
 app/etc/modules/Mage_CurrencySymbol.xml
 app/etc/modules/Mage_Downloadable.xml
@@ -76,6 +77,7 @@ lib/.htaccess
 lib/LinLibertineFont/
 lib/Mage/
 lib/PEAR/
+lib/Pelago/
 lib/phpseclib/
 lib/Varien/
 lib/Zend/