MNT: Changes by @tacaswell
ENH: Subclassed lmfit models to rewrite the docs

- This is so that we don't lose the parameter guessing that is
  built in to lmfit but we do get the docstrings we need
MNT: Fixed merge conflicts