Use CLI args for stress.js and add a small comment for clarity in server.c
Merge remote-tracking branch 'origin/master'
Move line to test Travis-CI commit hooks