Changes to Makefile to fully handle deployment and package updates