Fix line numbers and make `rspec -l` work
Merge branch 'fix-line-number'

Conflicts:
	spec/integration_spec.rb