More clean up
Merge branch 'master' into platform-support

Conflicts:
	src/_viennacl/pyviennacl.hpp
	src/_viennacl/structured_matrix.hpp
	src/_viennacl/vector.hpp
More clean-up