Merged sosmodel into normal model.jl
Mashed together QP stuff, refactored slightly
Finish test refactor