Fix matrix operator overloads

Closes #70
Add matrix operator tests
Merge pull request #74 from bjz/issue-70

Fix matrix operator overloads