Merge branch 'master' of github.com:akerl/basic_cache

Conflicts:
	lib/basic_cache.rb