Work on demo & test prepop data
Merge branch 'master' of git://github.com/graeme-f/eden