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

hand cache_options from config to build
Merge branch 'master' into rkh-casher
bundle install the sh*t out of this
Merge branch 'rkh-casher' into staging

Conflicts:
	Gemfile.lock