Update specs to use rspec 3 syntax
Fixing Rubocop complaints
Merge remote-tracking branch 'origin/fixing-rubocop-complaints' into rspec3ify
Fixing single quote interpretation in integration spec
Merge remote-tracking branch 'origin/fixing-rubocop-complaints' into use-bats-tests

Conflicts:
	spec/integration/end_to_end_spec.rb
Adding bats tests to Travis