Some basic stuff...

Signed-off-by: Mark Marsh <github@flambe.me.uk>
Merge branch 'master' of https://github.com/MarkMarsh/CableBot