Update dependencies.
Merge pull request #1669 from XhmikosR/2.x

Update dependencies.
Revert "Removed 'trailing'."

This reverts commit 0c0e19319b276b019d285bdfd2cfc49126abd814.
Revert "Removed 'smarttabs' and stopped warning about mixed spaces and tabs."

This reverts commit 4035fef1af4ef426e9dc99918ca3aac0ce44b784.

Conflicts:
	package.json
Revert "Remove code for enforcing indentation."

This reverts commit 30c001979d84703736ae91564658805a88b6a798.
Revert "Remove 'white' and 'gcl'."

This reverts commit 12147ed96c66faa638835a6b747b5e9127cb18b0.

Conflicts:
	package.json
	src/jshint.js
	src/messages.js
Revert "Remove 'passfail'."

This reverts commit f1b4ab41f729b7ad38e860765f54c625bde8e199.
Revert "Remove 'onevar'."

This reverts commit a514670fbaa70827de46e8f07bd02db83e6aec81.
Revert "Remove 'nomen'"

This reverts commit c09706c7d49dd5e8f4d2a9475886910a4b81e12f.