Misc doc fixes 201412

Hi,
These are just some obvious doc changes,
however I seem to have picked up your 0.2.5 to 0.2.6 setup.py change.
-tim