Katie

Here's the pull request on my branch which is about to get a sweet Pony email function.  Consider this convo OPEN.