Preparing the pull request
Merge branch 'master' of github.com:danreedy/amalgamate
Finishing up the concern extension. Still need to get specs to pass