Don't patch up metadata if we're not using Chef Server
Include the chef-solo-search plugin
Don't update the config file
Move unless
Move unless
Move unless
Update unless
Merge pull request #101 from Metaswitch/em_disconnect

[Reviewer: Andy] Em disconnect