Updated with commented out sections

Added links to manual installs in readme
Merge pull request #7 from roblevintennis/merge-upstream-june

Merge upstream june