Fixed mapping resolving
Tidying up code
Fixed defunct route handler merging
Merge pull request #87 from symfony-cmf/mapping_refactor_fix

Mapping refactor fix