Mixed profile

This should close #2102.  I did not correctly update the profile likelihood code after creating a class for managing the model parameters.

I also updated the notebook at:

http://nbviewer.ipython.org/urls/umich.box.com/shared/static/6tfc1e0q6jincsv5pgfa.ipynb