Merge branch 'bug/macosx-build' into develop

* bug/macosx-build:
  fix include file name on OSX
Clean up warnings (clang + gcc4.7 on OSX)
fixed typo
Merge pull request #55 from wesen/feature/clean-warnings

Clean up warnings