After merging Mike's pull request I accidentally reverted it somehow.  This is the fix.

I merged Mike's pull request.  And then somehow through Github accidentally reverted that merge.  Locally I used the git revert command to commit Mike's original pull request.  I then pushed it to my origin master and this is the pull request to restore everything to where it was before I touched anything =).

At least there is git history for everything and we should be able to move forward without any trouble.