Do not include Makefile in dotfiles list, of course!
Merge remote-tracking branch 'origin/master' into laptop