add checks for server name or chef node name
Merge branch 'master' into force_name_flag_fix
Merge pull request #29 from modcloth/force_name_flag_fix

Force server alias / chef node name