cleanups
Merge branch 'master' of github.com:zwostein/CGFramework