Add ensure_newline_at_eof_on_save option to Sublime and others
Add few merge options to gitconfig
Update gemrc