move msg_pair def to base
add server name flag back in and remove repeated def for bootstrap
Merge pull request #28 from modcloth/merge_fix_modcloth

Merge fix modcloth