Code coverage, more cleanup, etc.

@degan Remind me to get us set up with [secure environment variables](http://about.travis-ci.org/docs/user/build-configuration/#Secure-environment-variables) on Travis so *all* of the specs will be run.

**Edit**: Also, bam!

![screenshot 2013-11-10 01 29 12](https://f.cloud.github.com/assets/154671/1508368/c3d1f2c4-49f2-11e3-9bd4-04505a9ca4ce.png)