All encryptions work. settings.h generic, allow end user mod
Merge pull request #117 from kaleb-himes/master

All encryptions work. settings.h generic, allow end user mod
Merge remote-tracking branch 'upstream/master'