Add FACTER_CONDUCTOR_HOSTNAME, move tim config within puppet

Added FACTER_CONDUCTOR_HOSTNAME so that tim's callback_url gets set
correctly.  Move tim puppet config blocks from setup/ to config/ .