Refs #30. Changing version number and code.
Refs #32. Copying all the layouts.

It seems that the merge technique doesn't work quite as advertised and
I'm not making any progress finding an elegant solution. Using a brute
force one.