Cleanup of site.yml

Whitespace, play/task naming, remove unused include naming