Merged better-defaults and added ido-ubiquitous