Clean up and bug fix

For easier review, [ignore the last commit making the LF changes](https://github.com/axemclion/grunt-saucelabs/pull/27/files?w=1).