Fixes #131 - Wrong name for bitstream file

src/main/scala/tapasco/activity/composers/VivadoComposer.scala

@@ -215,7 +215,7 @@ object VivadoComposer {
     lazy val outdir: Path    = cfg.outputDir(c, t, f, fs)
     lazy val logFile: Path   = outdir.resolve("%s.log".format(c.id))
     lazy val tclFile: Path   = outdir.resolve("%s.tcl".format(t.pd.name))
-    lazy val bitFile: Path   = outdir.resolve("%s.bit".format(c.id))
+    lazy val bitFile: Path   = logFile.resolveSibling("%s.bit".format(Composer.mkProjectName(c, t, f)))
     lazy val runName: String = "%s with %s[F=%1.3f]".format(logformat(c), t, f)
     lazy val pwrFile: Path   = logFile.resolveSibling("power.txt")
     lazy val timFile: Path   = logFile.resolveSibling("timing.txt")

src/main/scala/tapasco/task/ComposeTask.scala

@@ -62,7 +62,7 @@ class ComposeTask(composition: Composition,
         designFrequency,
         target,
         _composerResult map (_.result) getOrElse "",
-        _composerResult map (_.bit) getOrElse "",
+        _composerResult flatMap (_.bit) getOrElse "",
         _composerResult flatMap (_.log map (_.file)) getOrElse "",
         _composerResult flatMap (_.util map (_.file)) getOrElse "",
         _composerResult flatMap (_.timing map (_.file)) getOrElse "",