Merge pull request #62 from fluffynuts/fix-site-generation

Move site back where it belongs