fix for ssh upstart and some rubocop cleanup
merge