Clean up Makefile and allow pip --upgrade