knife.rb: moving setting of chef_server URL to after organization setting (TODO: add knock-out for other chef_server)
Merge branch 'master' of github.com:infochimps-labs/ironfan-homebase

Conflicts:
	knife/knife.rb
removed merge issue