Added underscore 1.5.2 via Bower
Use an underscore template instead of some long-ass string
Refactoring