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
switch to cleaner swap and pop version
Merge pull request #2 from datasift/feature/pollerfeatures

Feature/pollerfeatures
whitespace
C++11 syntax
removed pointless 'flush' option from client
further improvements to client for streaming

add --exit-when-no-input option;
add --ignore-zeroes option;
fix sending of accumulated message buffer;
display end-of-output message
Merge pull request #3 from datasift/feature/dsp_386

Feature/dsp 386
older g++ support where = delete isn't valid
unneed file
Merge branch 'develop' of github.com:benjamg/zmqpp into develop

Conflicts:
	.gitignore
Merge pull request #10 from datasift/develop

Merging in datasift changes