dataplug: more headers
Merge branch 'dataplug' of github.com:devrandom/Gibberbot into dataplug
Merge branch 'dataplug' of github.com:devrandom/Gibberbot into dataplug