docs(readme): remove outdated testing instructions

The testing instructions were really out of date and didn't apply anymore
fix(css): remove merge conflicts

Remove the merge conflicts from the file
Merge branch 'master' of https://github.com/yeoman/generator-angular
fix(tests): service tests now load the correct module