Started moving things to services and cleaning up some early messes
Add twig extension
Merge pull request #28 from Vectorface/cleanup

Resolves Issue #27 - Refactoring