Use --binstubs and no bundle path for bundler
Add xray-rails config
Added requirements file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bundle/config