Fix up Makefile and get rid of cargo-lite