make-up correction
Merge remote branch 'origin/master'
allow import of sift even if pyopencl is not present
The text of the license corresponding to the MIT not to the BSD ...
all updated.