XBMC Compatible Branch, No OC, No Swap

Removed swap and OC.
Removed apt-get upgrade for XBMC compatibility.
Removed the gpu mem modification for XBMC compatibility 
Added Bzip2 install which was missing
Added uninstall function (comes handy when trying out stuff)
Update owncloudpie_setup.sh
rename
merge conflict solved