k88hudson/butter — pull request #20 by mjschranz (2012-08-12 02:09:50+00:00)
Title: Merged in all my recent changes. Fixed up editors around them.

Here ya go!