Val Stuff
Merge pull request #38 from dckesler/master

Fixed some email stuff, some button stuff, and then Jess freaked out...
Merge
Merge pull request #40 from SocketBot/master

Merging?