proper key inspection

Make the key inspection slightly more sophisticated.  This saves 10 second wait by only accepting pre-keys.

Currently the bootstrap starts both the minion and the master.  Unless we change the bootstrap to also handle key placement (probaby the right thing to do), the master will have a single unaccepted key when it starts.  I believe causes a 10 second hang judging by the logs.

This patch basically looks at all the keys we are uploading and all the keys that are in pre-salt for the master, and accepts those of the same name operating on the assumption they are the same.   This assumption is ok for development on a private network, but  opens a window for minion spoofing that would be unacceptable in a less controlled setting.