Remove unused init options
Move logic into collector context
Whitespace
DatabaseReplicationStats should only be for extended

Not everyone uses replication
Add stats for monitoring xid wraparound
fix #747

added a test as well. reviews of the test are welcom
Merge pull request #748 from m1keil/master

fix #747
Remove unneeded config option
Merge branch 'master' of github.com:BrightcoveOS/Diamond into new_threading_model

Conflicts:
	src/collectors/snmpraw/test/testsnmpraw.py
Merge branch 'master' of github.com:python-diamond/Diamond
Merge pull request #18 from python-diamond/xid

Add stats for monitoring xid wraparound
Merge branch 'master' of github.com:BrightcoveOS/Diamond into new_threading_model