Merge pull request #2570 from dalers/develop

fix web links and clarify install options