Bumped XBMC build script to use -j8
Addon and repo updates
Fixed up confluence as it was broken by previous cherry-picked commit