Make process exit on test failure configurable
Forgot a comma
Revert "Forgot a comma"

This reverts commit 4c207c8f078d9f059d360998853460961a66b981.
Revert "Make process exit on test failure configurable"

This reverts commit 1be6184c34117cf862b157589038f4ef0c906021.
Use sflyphotobooks version of Karma

This is to avoid a transient dependency on socket.io 0.9.17, which causes disconnect errors.
Merge branch 'master' of https://github.com/sflyphotobooks/grunt-karma

Conflicts:
	package.json