added Modeler Interface
Merge branch 'master' into greedy_optimizer

keeping my branch up to date with master
reconfiguring some things given yesterday's meeting
optimizer should work in principle, working on testing