new version of jshint caught some new issues, fixing issues
Merge pull request #123 from diwu1989/jshint

new verison of jshint caught some new issues, fixing issues
Merge remote-tracking branch 'upstream/master' into OrderByValue

Conflicts:
	lib/node/orderByValue.js
	lib/node/valueExpression.js
fix merge conflicts