Merge pull request #76 from mithro/master

Rename flip-flop muxes to make Vivado GUI names.