Updated with stuff from .dotfiles and my own stuff