Update README from wiki
Merge pull request #1 from ghoneycutt/update_readme_from_wiki

Update README from wiki