Adding PSS and padding options

I'd love to get these changes from @davedoesdev and @krisb merged back into the mainline repo, there's some conflicts from the divergence now that will take a little work yet.