Merge variants into one code

[rwesson]

There are currently standard, x-ray enabled, and voronoi grid versions of mocassin. It would be preferable if these were merged into one code with switches for different use cases.