Merge latest pycogent changes

Merge latest pycogent changes from head master branch