Updated to newest version and did some housekeeping
Merge branch 'master' of https://github.com/ryanbartley/Cinder-Bullet3D