Working towards key generation, started cleanup of config, changing
armor api slightly to pass in whether or not to show version string, not
entirely happy with current solution.