Removed unnecessary optimization parameters.
Made member functions for each objective term.
Merge branch 'master' of https://github.com/fitze/feliscatus
Made one small change on top of Sean's revision of modeling.