various rails3 fixes - encoding, form_for (= not -), html_safe, error handling, missed merges