Updates
Merge branch 'master' of github.com:velankanisys/knife-ucs

Conflicts:
	knife-ucs.gemspec