More robust complex.hpp
Makefiles and config for OSX
Removing nvcc warnings
Merge branch 'master' into kNN
experimental Makefile