Automatically fix some rubocop issues with "rubocop -a"
Fix more rubocop issues
Fix new rubocop issues
Fix a rubocop issue with using rescue as a modifier
Merge branch 'develop' into rubocop

Conflicts:
	lib/jobim.rb
	lib/jobim/cli.rb
	spec/jobim_cli_spec.rb
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