adding grep to makefile tests, fixes #11
fixing callbacks for .waits()
Merge pull request #95 from segmentio/fix/upload

adding grep to makefile tests and fixes #11