Update manual with 2.1 version number. Fix broken setup.py install.