Merge pull request #223 from chrox/master

fix lastCharMargin of hyphenated word eats spacing after that word
add ffi declarations for zframe and zsocket in czmq