cache stuff
Merge branch 'master' of https://github.com/Jleagle/sick-beard-library

Conflicts:
	app/controllers/SickBeardController.php