Merge pull request #7 from kevinpeterson/0.6.x

Provenance creation updates and fixes for 'With' keyword functionality.
Fix provenance extraction
[Shapes] Generate "meta" factories for WM tasks
[Provenance] Improve API usage
When an @Evidence annotation contains more than one @Display annotation, make sure the template cache takes that into account so that the correct template for each display is used.