Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	test/tasks/init.spec.js

Author: benholloway

appveyor.yml

@@ -21,6 +21,6 @@ install:
   - jasmine-node --version
 
 test_script:
-  - npm test
+  - jasmine-node --verbose --test-dir C:\projects\node-angularity\test
 
 build: off

tasks/init.js

@@ -260,7 +260,6 @@ gulp.task('init', function (done) {
         'init:angularity',
         cliArgs.npm && 'init:npm',
         cliArgs.bower && 'init:bower',
-        cliArgs.bower && 'init:bower',
         cliArgs.karma && 'init:karma',
         cliArgs.jshint && 'init:jshint',
         cliArgs.gitignore && 'init:gitignore'

test/tasks/init.spec.js

@@ -41,9 +41,6 @@ describe('The Angularity init task should correctly initialise all the files nee
         //'init:jshint'
         expect(fs.existsSync(path.join(initTempPath, '.jshintrc'))).toBe(true);
 
-        //'init:gitignore'
-        expect(fs.existsSync(path.join(initTempPath, '.gitignore'))).toBe(true);
-
         //'init:composition'
         var appPath = path.join(initTempPath, 'app');
         expect(fs.existsSync(path.join(appPath, 'index.html'))).toBe(true);