add sauceconnect back and test using it
get and use sauce_connect manually rather than with travis addon
Name the env vars
Strip carriage returns when parsing manifest lines.
Add test for stripping carriage returns.
update saucelabs encrypted values
Merge branch 'master' into saucelabs-take2

Conflicts:
	.travis.yml
async-queue isn't used anymore
add sinon to karma files
reorder sinon files
more browsers on saucelabs
comma
update browsers and only use chrome and ipad
Merge pull request #55 from videojs/saucelabs-more-browsers

Saucelabs more browsers
Merge pull request #52 from bclwhitaker/bugfix/stripCarriageReturns

Strip carriage returns when parsing lines in manifests.
One grunt test task to rule them all.
You can now test on travis with saucelabs or local browsers locally.
You can give the grunt 'test' task arguments with which browers you want
to run.
Merge pull request #53 from videojs/saucelabs-take2

Run tests on saucelabs
Add playlist loader files to karma config.
Merge branch 'master' into feature/playlist-loader

Conflicts:
	test/videojs-hls.html