Re-enable Caffe tests

[pcmoritz]

At the moment, Caffe and TensorFlow tests can't be run together because they both seem to lock the GPU; for now we work around this problem by just running the TensorFlow tests when sbt assembly is run; this should be changed