Merged in some of Jeff's changes to Makefile.deploy