Changing karma-config.js to be a valid karma config file.
Enabling Karma to do Javascript Unit testing on SauceLabs.

 grunt sauce:minifill
 grunt sauce:maxifill
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js
	package.json