add cherrypy3 to Makefile, clean up some git