More robust complex.hpp
Temporary butterfly
Makefiles and config for OSX
Removing nvcc warnings
Another nvcc warning
OpenMP fence
Merge branch 'master' into Butterfly