Merge pull request #75 from ethz-asl/feature/compile-osx

Small changes to get things compiling on osx
Merge branch 'master' into feature/compile-osx
Removing bad apple specific stuff