Clarified OS X issue.
Another OS X clarification
Merge commit '8cd2e5aaab1713b08f86dd2f9281a65e0b6547ad' into develop
Merge pull request #56 from splunk/develop

Merge develop into master following minor CHANGELOG edits.