Merge remote-tracking branch 'thenickperson/rubocop' into develop

Conflicts:
	lib/jobim/cli.rb
	lib/jobim/server.rb
	lib/jobim/settings.rb
	spec/jobim_server_spec.rb
	spec/jobim_settings_spec.rb