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.