Better errors, quiet assets, Twitter Bootstrap, Default layout
Merge changes