Move ERB functionality to wrapper class
Fixes from code review
Always configure git last
Small refactorings
Re-add file_manager