* Add a TODO
Merge branch 'master' of https://github.com/vhtisdale/ola-ui
* Add another TODO
* Add some more TODOs
Merge branch 'master' of https://github.com/vhtisdale/ola-ui

Conflicts:
	simple_ui.py
* Add some more TOODs
 * Stub out the control flow a bit more
Merge remote-tracking branch 'simon/master'
TODOs seemingly complete. run program and select device. (dimmer working for sure)