Added options to compile under OSX.
Adds minor changes to a few files
Merge branch 'opencl' of https://github.com/hannorein/rebound into hannorein-opencl
Merge branch 'hannorein-opencl' into opencl