Re-order Makefile install and uninstall a bit. Specifically