add the beginnings of caching, nice js starter ob
Merge branch 'master' of https://github.com/beaucharman/samurai

Conflicts:
	samurai/library/extensions/helpers.php