Merge branch 'develop' of https://github.com/efabless/caravel into develop

Pull because somebody pushed before I could.