Add cli script
Update to new config format
Merge pull request #6 from unikent/master

[DeployBot] STABLE Pull