Update README.md
Use a param to specify the location of simplesamlphp
(cherry picked from commit 4312e69)
Updated webroot dir in deploy script
Merge remote-tracking branch 'origin/master' into release