fix some mistakes and re-tab
Merge branch 'dev' of github.com:lukejohnosmahi/eventstreamr into dev