Clean up warnings (clang + gcc4.7 on OSX)
Merge branch 'feature/clean-warnings' into develop

* feature/clean-warnings:
  Clean up warnings (clang + gcc4.7 on OSX)