Updated to 2.0 and updated README.

Pulled in 2.0 code and updated README links.