Merge branch 'laptop' of github.com:dopefishh/dotfiles into laptop