added line break, need to update this whole client for bash script styles
inert
moved all diagnostic output onto stderr
annotation of output lines now optional
additional minor output options
Merge branch 'master' into feature/dsp_386

Manually resolved/edited <./src/client/main.cpp>
correction for multipart handling
Merge pull request #1 from datasift/feature/dsp_386

Feature/dsp 386