Geoff's hilarious fuckin email jokes have been added
Merge branch 'master' into Geoffs_WIP