CLEAN UP ALL THE THINGS
Merge pull request #24 from benwoody/6_cleanup_specs

CLEAN UP ALL THE THINGS