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