Lotsa much-needed changes
Merge branch 'master' of https://github.com/da667/Autosnort