Updating docs
Merge branch 'master' into betterdocs

Conflicts:
	README.md
Merge pull request #189 from gvn/betterdocs

Updating docs