Merge pull request #392 from unix-ninja/master

Various refactor changes

diff --cc include/shared.h
Simple merge

diff --cc include/types.h
Simple merge

diff --cc src/hashcat.c
Simple merge

diff --cc src/shared.c
Simple merge