Merge remote-tracking branch 'origin/master' into develop

util/list_keyboards.sh

@@ -3,8 +3,6 @@
 #
 # This allows us to exclude keyboards by including a .noci file.
 
-find -L keyboards -type f -name rules.mk | grep -v keymaps | while read keyboard; do
-	keyboard=$(echo $keyboard | sed 's!keyboards/\(.*\)/rules.mk!\1!')
-
+find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | while read keyboard; do
 	[ "$1" = "noci" -a -e "keyboards/${keyboard}/.noci" ] || echo "$keyboard"
 done