Merge branch 'integration' of gitlab.it-innovation.soton.ac.uk:FLAME/flame-clmc into integration

.gitattributes

@@ -7,4 +7,3 @@ scripts/*  text eol=lf
 *.png binary
 *.jpg binary
 *.build-config/
-*.pytest_cache/
\ No newline at end of file

.gitignore

@@ -7,3 +7,4 @@
 *_version.py*
 *reporc
 ubuntu-xenial-16.04-cloudimg-console.log
+**/.pytest_cache/
\ No newline at end of file

clmctest/scripts/.pytest_cache/v/cache/lastfailed

-{
-  "test_config_telegraf.py::test_write_telegraf_conf": true
-}
\ No newline at end of file