Revision 5905

Addition now works with mixed types.

We can now add reals to complexes (and vice versa).
Main change here is that binary operations take multiple
template params to account for type mixing.
Fixed a bug in the binary tensor template where the wrong
type proxy was used.