Merge branch 'master' into log_proba

.gitignore

doc/modules/grid_search.rst

examples/grid_search_text_feature_extraction.py

examples/mlcomp_sparse_document_classification.py

examples/plot_species_distribution_modeling.py

scikits/learn/feature_selection/univariate_selection.py

scikits/learn/glm/logistic.py

scikits/learn/glm/sparse/logistic.py

scikits/learn/grid_search.py

scikits/learn/lda.py

scikits/learn/qda.py

scikits/learn/svm/base.py

scikits/learn/svm/sparse/base.py

scikits/learn/svm/tests/test_svm.py