dannye/pokered — pull request #1 by kanzure (2013-09-11 01:11:30+00:00)
Title: Merge so that iimarckus does less work

Here's how to make iimarckus happy.