Incorporated a couple things from other people's dotfiles