Minor Ruby style and module usability cleanup
Merge pull request #1 from jhart-r7/landing-4229-jhart

Minor Ruby style and module usability cleanup
resolving merge conflicts, hopefully
finish merge
modified to get data collection off sock working
improving DLSw detection
working with DLSw protocol check
removing timeout method and option
Minor style/usability cleanups