for merge
Merge remote-tracking branch 'simon/master'
TODOs seemingly complete. run program and select device. (dimmer working for sure)
* Stub out some notebook methods