Merge pull request #11 from neverpanic/master

Fix various minor issues, try to get coffeestats-cli working again