add unimpaired
allow non-ft merges
switch to solarized color scheme
don't show errors in html (messes up partial template editing)