Updates:
- Added the extra options to the command line so that XBMC can be
upadted and/or cleaned.
Tidying up imports