Remove accidentally added package
Updated jasmine link to be in the same style as the rest
missing comma.
Halverwege omzetten naar promises. Deze commit amenden
Merge remote-tracking branch 'jauco/jsdoc' into jsdoc-integrate

Conflicts:
	package.json
	src/lib/launchKarma.js
	src/lib/lintFile.js
minor corrections to the readme
fixes package.json after incorrect merge conflict resolution
work in progress on changing callback styl async code into promise style code