Prepare for merge to master
Merge branch 'chaorace-master'

Revamps the pinging system and prepares for plugins