Merge pull request #85 from leofeyer/master

Website changes as discussed
Merge pull request #86 from bobthecow/master

Fix included PSR translations.