bkase/rebase-harder — pull request #26 by mclute (2013-11-24 01:13:25+00:00)
Title: Mclute rebase me

I think I got it right this time?