Dont try to load collectors files that start with a period. It can be extended attribute files or vim backups or similar and can lead to some weird errors.
make UsersCollector compatible with python-utmp

 * plug the collector
 * update & check the test
Prevent sudo from asking for a password for ipvscollector
Merge pull request #283 from ImmobilienScout24/master

Changes behaviour of diskspace.py how monitored filesystems are collected
Merge pull request #282 from NotSqrt/edit-collectors

make UsersCollector compatible with python-utmp
Merge branch 'master' of github.com:BrightcoveOS/Diamond

is necessary,
Doc updates
Pep8 and optimization. Only run the regexs once
Merge remote-tracking branch 'upstream/master'