Tidied up PclContrib files, Unit Tested Pbkdf2 implimentation, refactored GeneratorService