Makefile: uglifyjs command line improvement so args aren't misinterpreted as options
Merge branch 'master' of github.com:karlvr/consistent.js