Implemented the diag() accessor in the generator
Merge branch 'master' of https://github.com/viennacl/viennacl-dev