Sender refactor

I merged in my SMS Sender refactor. Sorry about the commit being "foo". Jeff and I messed up the git commands a bit.

This pull request is basically for a code review. You can leave comments or merge it if you don't have any.