Rebase onto master to include compatibility code with sklearn 0.19
Rebase onto master to include compatibility code with sklearn 0.19


betatim/BlackBox,scikit-optimize/scikit-optimize,scikit-optimize/scikit-optimize,betatim/BlackBox