Added missing nunjucksify dependency
Cleaned up main a bit