Updated Makefile and tox.ini to remove duplicated package builds