Fix YAML errors
Fix more layout crashers
Merge branch 'rails3-upgrade' of github.com:kete/kete into rails3-upgrade