Pass through args to localkube
Fix merge conflicts
Add config dir support to kubelet
Make sure that config files are closed properly
Make config dir handling deterministic
Merge pull request #173 from jjhuff/multi_manifest

Add config dir support to kubelet
File name should have changed during query->selector rename.
Make selector parsing deterministic
Merge pull request #190 from lavalamp/fix_name

File name should have changed during query->selector rename. Also, make selector parsing deterministic.
Deflake a test w/ go1.3 random maps.