Usergrid 250 buffer size fix

Creating the initial PR for review.  Do not merge yet.