various changes
Merge branch 'master' of github.com:allynfolksjr/Celluloid