Added on/off for skivvy and top-level Makefile