Bump up buffer count
Merge branch 'master' of github.com:bgamari/tracker
feedback: Fix merge issues