small fixes to setup.py and Makefile
add install instructions...
fix merge conflicts