Dmlibmesh

Fixing conflicts.  If this looks too insane, I'll probably just rebase instead...