Resolved conflicts I had with messaging / bitgrid
Merge pull request #8 from jcbrock/messaging2

Resolved conflicts I had with messaging / bitgrid