Merged 2.0 Branch into Trunk

Its done! I've merged the 2.0 branch into trunk. There is a 1.1 branch if there are any reasons to keep that version supported. Otherwise as 2.x progresses, I'll move it to the attic.