Guest email

![josh milk](https://f.cloud.github.com/assets/4682033/1669610/8f1297d0-5c7d-11e3-8e88-bffff2fee87f.gif)


Sooo many merge conflicts