#330 implement the -watch parameter
#330 allow script reloading during execution and tidy up logging
Merge pull request #683 from adamralph/330

#330 implement the -watch parameter
Merge remote-tracking branch 'upstream/dev' into dev