Support domains on upstream
Use form_buttons, add update method
Merge pull request #956 from weissjeffm/domains

Support domains on upstream