CODE REVIEW 2013-12-03 (DO NOT MERGE)

Also...

Someone should:

```
git rm coverage
echo "/coverage" >> .gitignore
...
git commit
```