Usergrid 250 buffer size fix

Creating the initial PR for review.  Do not merge yet.
Done.  After looking at this more I agree.