Basically undoing the last commit.  I made a mistake calling things `site`, they should be named `site.data`.
Merge branch 'master' of http://github.com/SimonGoring/neotoma