Include blaze-layout and fix iron-router branch.