Merge branch 'master' of github.com:openframeworks/apothecary
Merge branch 'master' of github.com:bakercp/apothecary