Sample grid disappeared somehow. Now reinstated.

Moved __init__.mako.py back to __init__.py since no mako stuff used.
Corrected CMakeLists.txt accordingly.