Merge branch 'master' into markj-kernel-config
Add geom_eli.
Rename LAPTOP to MARKJ.
Merge branch 'markj-kernel-config' into markj-develop