Merge pull request python-diamond#554 from python-diamond/remove-pyc

Ensure we call `make clean` to remove pyc files from build output

Merge pull request python-diamond#552 from python-diamond/josegonzale…

…z-patch-2

Set a proper email address in setup.py

Merge pull request python-diamond#453 from BanjoInc/create_ntp_collector

Add ntp collector

Cut version 4.0 with new threading library

Diamond version 3.5.0

Tagging version 3.4

Happy Holidays

Tag v3.2 for real

tagged version 3.1

Version bump to fix startup issues for centos 5