Removed setup.py
Enhanced makefile with several new commands and variables