Add configuration for master host/port

Also fix post rename issues