Fixed tests and script on windows
minor tweaks to get tests to work on both windows and *nix
add @olsh to the package contributors
Merge branch 'master' of https://github.com/rpl/grunt-mozilla-addon-sdk

Conflicts:
	scripts/cfx.bat
	test/fixtures/test-addon/test/test-main.js