Layout should own bookmarker instead of being global.
Merge branch 'tracer_model' of https://github.com/sandialabs/slycat into tracer_model