Commit local changes prior to merge
Merge with upstream and rebuild theme
Update fabric hostname setup