Callout redux
Merge branch 'master' of github.com:theablefew/porcelain