Adding ability to specify source as cookbook:// url for convenience
Merge branch 'master' of https://github.com/sponte/windows

Conflicts:
	libraries/helper.rb