Changes found on Bob
Merge pull request #64 from hawesie/bob

Merging in a lot of changes used to make Bob work at G4S
Merge branch 'hydro-devel' of https://github.com/strands-project/strands_executive into hydro-devel