Merge pull request #23 from TrentBartlem/master

semi-regular merge
Merge pull request #6 from eveRedditBot/master

Merge pull request #23 from TrentBartlem/master