Cleaned up README and docs.
Merge branch 'master' into ticket/34