Made everything compatible with viennacl-dev's master
Merge remote-tracking branch 'PhilippeTillet/master'

Conflicts:
	external/viennacl-dev
	src/_viennacl/dense_matrix.h
Update viennacl-dev to upstream master
Clean up
Merge branch 'master' into platform-support

Conflicts:
	src/_viennacl/dense_matrix.h
Missed bits from merge
Stray deprecated param