Merge branch 'master' into annotation-experiment

# Conflicts:
#	chiselFrontend/src/main/scala/chisel3/core/Module.scala
#	chiselFrontend/src/main/scala/chisel3/internal/Builder.scala
#	src/main/scala/chisel3/Driver.scala
#	src/main/scala/chisel3/internal/firrtl/Emitter.scala
#	src/test/scala/chiselTests/AnnotatingExample.scala