Merge branch 'master' into dev

config.json

@@ -1,9 +1,9 @@
 {
-  "hcatPath": "/opt/hashcat-3.40/",
-  "hcatBin": "hashcat64.bin",
+  "hcatPath": "/Passwords/hashcat",
+  "hcatBin": "hashcat",
   "hcatTuning": "--force",
-  "hcatWordlists": "/mnt/extra/wordlists",
-  "hcatOptimizedWordlists": "/mnt/extra/rDownloads/new-wordlists",
+  "hcatWordlists": "/Passwords/wordlists",
+  "hcatOptimizedWordlists": "/Passwords/optimized_wordlists",
   "_comment": "Change extension to .bin for Linux and .app for OSX",
   "hcatExpanderBin": "expander.app",
   "hcatCombinatorBin": "combinator.app",

hate_crack.py

@@ -2,15 +2,16 @@
 
 # Methodology provided by Martin Bos (pure_hate)
 # Original script provided by Larry Spohn (spoonman)
+# Python refactoring and general fixing, Justin Bollinger (bandrel)
 
 import subprocess
 import sys
 import os
 import signal
 import time
-import json
 import random
 import re
+import json
 
 # python2/3 compatability
 try:
@@ -20,7 +21,6 @@ except NameError:
 
 
 hate_path = os.path.dirname(os.path.realpath(__file__))
-
 with open(hate_path + '/config.json') as config:
     config_parser = json.load(config)
 

requirements.txt

@@ -1 +0,0 @@
-configparser