Renamed _c.js underscore.c js because it won't be published to github
pages otherwise
Merge branch 'master' into gh-pages