Rewrite for yeoman-generator 0.17.x
Merge branch 'master' into new

Conflicts:
	package.json
Merge pull request #194 from silvenon/new

Rewrite for yeoman-generator 0.17.x
Make gulp serve depend on gulp watch

Users should now run gulp serve instead.

Fixes #156.
Merge pull request #210 from silvenon/serve

Make gulp serve depend on gulp watch
Remove deprecated JSHint options
Merge pull request #212 from arthurvr/master

Remove deprecated JSHint options
Merge pull request #1 from yeoman/master

Update from master