Merge pull request #338 from patriot1burke/master

move things around
Merge pull request #339 from patriot1burke/master

more brute force detection
brute force settings