fix indentation and add p tags around Website links
Merge branch 'master' into gh-pages