Initial check in
Merge branch 'master' of github.com:jsabin/collectdSetup