Merge fix modcloth

Removed duplicate code and added server-name again for fix on issue https://github.com/kevinykchan/knife-joyent/issues/27