greatly improving tests
rewriting the tests using new yeoman doc recommendations
Merge branch 'master' into tests

Conflicts:
	lib/travis-generator.js
	package.json
lint
Merge pull request #6 from pwmckenna/tests

Tests