Updated README

Conflicts:

	README.markdown
Updated README to 2.1.0