hand cache_options from config to build
Merge pull request #81 from travis-ci/rkh-casher

hand cache_options from config to build
update travis-build
Merge branch 'master' into bluebox-production-com

Conflicts:
	Gemfile.lock