Merge pull request #164 from untergeek/2.x

Adding for documentation at rtfd.org
Merge remote-tracking branch 'upstream/2.x' into 2.x
Getting back on the correct track where 2.x is based on master
Fixes #167

Updated changelog with fix info

closes #167
Pre-release 2.0.0 cleanup