PY3: fixed NoneType comparison (when not in mac_os) in test_k_means_plus_plus_init_2_jobs() function in test_k_means.py module
Merge branch 'py3' of https://github.com/raulgarreta/scikit-learn into py3