Updating README
Merge branch 'update'

Conflicts:
	README.md
README faffin'
More README updating