Update Scikit-learn from 0.14 to 0.15.2
Merge pull request #260 from iamaziz/master

Update Scikit-learn from 0.14 to 0.15.2
Fix scikit docset.json
Processed docsets/Scikit/Scikit-learn.tgz
Add PouchDB
Merge pull request #262 from backspace/add-pouchdb

Add PouchDB
Processed docsets/PouchDB/PouchDB.tgz
Processed docsets/Scikit/Scikit-learn.tgz
Update the icon of Scrapy 0.22
Merge pull request #264 from iamaziz/master

Update the icon of Scrapy 0.22
Processed docsets/Scikit/Scikit-learn.tgz
fixed conflict