Merge branch 'master' of charles:/tank/andrew/code/scripts
-rwxr-xr-x 331 autocifs.sh
-rwxr-xr-x 877 avchdtomp4.sh
lrwxrwxrwx 17 beep.sh -> /home/andrew/beep
drwxr-xr-x - beeps
-rwxr-xr-x 928 duckduckget.sh
-rwxr-xr-x 330 flactomp3.sh
-rwxr-xr-x 1703 halloween.py
-rwxr-xr-x 3470 i3blocks-bandwidth.sh
-rwxr-xr-x 1489 i3blocks-cpu.pl
-rwxr-xr-x 845 i3blocks-music.pl
-rwxr-xr-x 2963 imgcat.sh
-rwxr-xr-x 122 macopen.sh
-rwxr-xr-x 1170 nameget.sh
-rwxr-xr-x 284 proxyman.sh
-rwxr-xr-x 74 torproxy2.sh
-rw-r--r-- 264 update-blocklist.sh
-rwxr-xr-x 6054 xfertest.sh
-rwxr-xr-x 103 zpoolstatus.sh