I can email you now, so suck it
merged asynchronous_updates and email branches