Branching AND merging are now working, with email notifications

This is sick!