Fixed survey bug, highlighted by the smoke tests.
Cleanup, modernise
Merge branch 'master' of git://github.com/flavour/eden