Merge pull request #64 from rad1us/develop

MQ keystore bug fixes for windows and UNIX support
Removed unnecessary agent directory
Merge pull request #65 from aleibl/develop

Removed unnecessary agent directory
Support enviroment variables in config