Ma/multiple keys

@opscode/server-team 
I'll squash before merging.