Minor README fix.
Minor doc fix.
More README updates.
Minor updates to setup.py.
Merge branch 'master' into stable