Merge branch 'master' of router:/srv/git/kaka/cakelight

diff --combined src/kaka/cakelight/Console.java
index 00a1269,fef4301..6339138
--- 1/src/kaka/cakelight/Console.java
--- 2/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@@ -25,7 -25,7 +25,7 @@@ public class Console extends Thread 
              System.out.print("> ");
              try {
                  String input = reader.readLine();
 -                if (input.equals("0") || input.equals("1") || input.equals("2")) {
 +                if (input.equals("0") || input.equals("1") || input.equals("2") || input.equals("3") || input.equals("4")) {
                    cakelight.setMode(new AmbientMode(new String[] {input}));
                    System.out.println("setting ambient mode to " + input);
                } else if (input.matches("(b|brightness)\\s+[0-9]+")) {
@@@ -33,7 -33,7 +33,7 @@@
                    config.leds.brightness = Integer.parseInt(split[1]);
                    System.out.println("setting brightness to " + split[1]);
                } else if (input.matches("q|quit")) {
-                   cakelight.cleanup();
+                   cakelight.turnOff();
                    System.out.println("stopping cakelight");
                    break;
                }