Merge pull request #28 from milesmatthias/master

Added a willis command to our campfire bot
Added a miles command.
Merged in latest from upstream/master.