Merge branches 'linux' and 'scroll-channels-btns' of https://github.com/linjam/linjam into winxp
minor bugfixes and housekeeping