Bring in changes from master branch

CHANGELOG.md

@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### New Features
 * Autocompletion for `iocsh.bash` has been added
 * Added consistency check between e3 environment variables and path to `iocsh.bash`. `iocsh.bash` will abort if these are not consistent.
+* Rudimentary testing has been added:
+* * Tests that the correct version is loaded
+* * Tests that elementary patching/building works as expected
 
 ### Bugfixes
 * `iocsh.bash --help` (and variants) no longer loads tries to load `env.sh`.