Fixes Camera, now all tests pass

![success](https://f.cloud.github.com/assets/3823490/1053693/130fb614-10f5-11e3-893c-09b0ffd7e317.png)