Allow switches to expose additional attributes apart from switch state
small cleanup
Merge remote-tracking branch 'andig/master' into development
minor style fixes