spring cleaning
Merge pull request #2 from square/steckel/spring-cleaning

spring cleaning