Improved Makefile (it now includes a deploy option)