scripts: sync with master

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
solo != sololite, so this will be nothing but hacks, drop

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
wand quad: is now in for-next, just use that over local patch

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>