Fixes #504. This adds a way to be smarter about hard coded paths in the collectors. We will scan via PATH and then check standard paths, failing back to the hard coded default if none are found
Fix return indention level
Merge branch 'master' of github.com:BrightcoveOS/Diamond
pep8 fixes