Merged some of my dotfile preferences