Cleanup of site.yml

Whitespace, play/task naming, remove unused include naming
Merge pull request #602 from blueboxgroup/cleanup-site

Cleanup of site.yml