some linting; add return to underscore.min
Merge branch 'master' of https://github.com/michaelmunson1/caracol