move msg_pair def to base
add server name flag back in and remove repeated def for bootstrap
Merge branch 'merge_fix_modcloth' into auto_tagging_provisions_with_user

Conflicts:
	lib/chef/knife/joyent_server_create.rb