Seperated merge/deploy into two seperate methods.

Created integration_branch object and made corresponding changes to
the active record schema.