Support setting presets through CLI. Add 'jquery' preset to test that support.
Merge remote-tracking branch 'jzaefferer/preset-support'

* jzaefferer/preset-support:
  Support setting presets through CLI. Add 'jquery' preset to test that support.

Conflicts:
	lib/options.js
add basic test for jquery preset and enable preset inheritance
add test to jquery preset cli arg