Build fixes for muskoka on Altera.  Tweaks for Xilinx as well.
Remove some debugging output
Remove mix of blocked and unblocked assignments