Merge pull request #300 from hrbrmstr/master

src/main-conf.c

src/masscan.h

src/out-ndjson.c

src/output.c

src/output.h

src/smack1.c