Multiple fixes

All tests passing.

- Broken requires
- Fixes failing tests
- Inconsistent indentation

Also, you should use 2 spaces for indentation, it is the standard for ruby.

![screen shot 2013-11-10 at 4 48 45 pm](https://f.cloud.github.com/assets/190648/1509956/8c23b12c-4a6b-11e3-94a0-d973624498a0.png)