README edits, fixes #1

Merging branches.