Revert to compatibility with viennacl prior to the matrix_base template parameter changes
Revert "Revert to compatibility with viennacl prior to the matrix_base template parameter changes"

This reverts commit 0f64f1d703c3b5b046966cd39d55046229c2c782.
More debugging info
Make test.py more like benchmarks.py