Merge pull request #176 from gitMbar/dev

Remove unecessary injections and cllarify
Add iffys to map files
Wrap factories in iffys
Wrap app in iffy