Added more camera stuff.
Merge branch 'master' of https://github.com/pgao/ychacks2014