Merge pull request #21 from TrentBartlem/master

vaguely semi-regular update
Merge pull request #4 from eveRedditBot/master

Merge pull request #21 from TrentBartlem/master