Add better-defaults

Also remove some stuff that better-defaults provides
un-disable upcase-region