small formatting change
moved templates down into utils directory
merged upstream (edsu's refactoring); updated README.md