Minor formatting improvements
Update CDI example to use CDI 1.1 with Weld
Merge remote-tracking branch 'upstream/master' into cdi-1.1-experimental