Merge pull request #290 from gabeos/feature/algebra

Feature/algebra
added sbt jacoco target... 65% coverage
optimizations to OpAdd/OpSub/OpMulScalar for CSC #290
weird merge.. moved too many things around..