update generator to 0.17.0 and testing

Only includes some testing updates
Merge pull request #372 from eddiemonge/testing

update generator to 0.17.0-pre.4 and testing
Changed all indentation to two spaces, updated jshintrc to reflect this. Fixes #286.
Merge pull request #383 from aendrew/two_spaces

Changed all indentation to two spaces, updated jshintrc. Fixes #286.
Merge pull request #8 from yeoman/master

Merge with latest base