mostly doc, roxygen, and namespace cleanup
Revert on master ugh!

This reverts commit d3b9caff760103e78b651e471f97e9c41b4237a4.
Add merMod
gitignore
blah
merge in dev
fix glms as well