Use functions for storing OS key types

This allows the OS to be more flexible in determining the key type.
Use version instead of codename as key for f21+
Merge pull request #349 from cottsay/f21-support

Re-work "version type" system to support Fedora 21+