cleaned up code, fixed "unary" weirdness
Merge branch 'master' of github.com:theJenix/scala-matrix