add checks for server name or chef node name
Merge pull request #28 from modcloth/merge_fix_modcloth

Merge fix modcloth
Merge branch 'master' into force_name_flag_fix
Merge branch 'force_name_flag_fix' into auto_tagging_provisions_with_user