Merge pull request #2370 from opscode/ryan/follow_symlinks

Make client.pem being a symlink a configurable option
Merge pull request #2381 from opscode/sersut/12-port-follow-symlink

Merge pull request #2370 from opscode/ryan/follow_symlinks