Update to underscore (noConflict)
Merge pull request #28 from iceraj/master

Update to underscore (noConflict)
Merge pull request #29 from starteam/develop

Develop