Make keys sane
Merge pull request #33 from jaccarmac/keys

Make keys sane