Better error msgs for bogus configs.
Merge branch 'master' of github.com:brunch/brunch