Re-enable optimization on when we use public vs private keys.
Re-enable optimization on when we use public vs private keys.

Minor cleanup on use of 'dictionary' type.

MSch/opscode-pushy-server,chef/opscode-pushy-server,MSch/opscode-pushy-server,chef/opscode-pushy-server,chef/opscode-pushy-server