Make the makefile fancier so we don't re-run data gathering and cleaning...

... very often