Rebases #14 off master.

This does two things:

1. Squashes #14 to be a single commit
2. Rebases it off Master and makes it pass linting.

It can replace #14 if you want @carldanley.

Also I accidentally gobbled up your commit in all of my rebases. I can give you that back, lol.