Fixes #2046
Merge pull request #2048 from bakercp/develop-clean

Fixes #2046
Merge branch 'develop' of https://github.com/openframeworks/openFrameworks.git into myDev_VS2012