Merged some dotfiles from holman/dotfiles