Various bugfixes
Merge branch 'master' of https://github.com/xbianonpi/xbian-config-bash