Add default dosbox.conf
git: Use upstream instead of simple

I decided that I like to do a git push from a branch with a short name
(nice for local use, easy to type) to a remote branch that may have a
longer, nicer to read name (for ease of understanding).