Fixed merge conflicts.

src/main/kotlin/com/r3corda/demos/IRSDemo.kt

@@ -462,4 +462,5 @@ private fun printHelp(parser: OptionParser) {
     Please refer to the documentation in docs/build/index.html for more info.
 
     """.trimIndent())
+    parser.printHelpOn(System.out)
 }

src/main/kotlin/com/r3corda/demos/TraderDemo.kt

@@ -71,7 +71,6 @@ fun main(args: Array<String>) {
 }
 
 fun runTraderDemo(args: Array<String>): Int {
-    val cashIssuerKey = generateKeyPair()
     val parser = OptionParser()
 
     val roleArg = parser.accepts("role").withRequiredArg().ofType(Role::class.java).required()