Revert "Revert "Moved Vector* to Vector in Matrix""

This reverts commit ca87d49120d220f7fc3e84aeb5a803eeb50e44b5.
Fixed bug in operator*=