Misc updates for brunch@1.6.7 in preperation for brunch@1.7.x.