Merge pull request #329 from paulusmack/wb-fix

Wishbone addressing fix

diff --cc fpga/top-arty.vhdl
Simple merge

diff --cc fpga/top-nexys-video.vhdl
Simple merge

diff --cc soc.vhdl
Simple merge