Replace build script with a smart wrapper

If a user simply types `make` it will run in parallel by default, which
is what we want to do in most cases.
Show how to update from several branches while testing