spring cleaning (in August)
Merge pull request #1 from jeremybenaim/2014

spring cleaning (in August)