* Added support for multi-line key files.
 * Minor removal of some dumb I did.
Merge pull request #1970 from piffey/devel

Devel