Make energenie commands a module
Update file links and add usage example
Resolve merge conflict
Merge branch 'bennuttall-master'