structural/DRY improvements
Merge branch 'master' of github.com:redouglas/styleguide