Merging lesson on doit from @rbeagrie

This pull request merges Makefile changes to reconcile developments in @rbeagrie's lesson on `doit` with changes to the master branch.