fixed optimization flag for osx
Merge branch 'master' into sde_inference
added makefile update to sde branch