Some tweaks in the march up to 2.0 final.
Fixed merge conflict
Updated documentation for 2.0 final.
Releasing the big 2.0.
2.0 release and tweak to the documentation.