Try to get this personal git repo up to date with the real master branch

So ignore or dismiss if it does not serve this purpose. Github is sooo unclear. Sorry.