Fix #152 - Start server for nbmerge when arguments given.
Merge pull request #153 from tarmstrong/start-server-for-arguments

Fix #152 - Start server for nbmerge when arguments are given.
Fix merge conflict.