faux
Merge branch 'master' of git://github.com/scikit-learn/scikit-learn
Merge branch 'master' of git://github.com/scikit-learn/scikit-learn
Added setupegg wrapper
Merge branch 'master' of git://github.com/scikit-learn/scikit-learn
Merge branch 'master' of git://github.com/matthagy/scikit-learn
Added feed vectorization functionality to text module