Allow the same mapping to be used more than once
Throw a specific exception when a mapping is not found
Provide tests for the templating helper
Provide tests for the twig extension
Updated UPGRADE instructions