Update underscore and fix status template
Merge pull request #24 from hadimichael/master

Update underscore and fix status template