middleman/middleman — pull request #685 by CaseyLeask (2012-12-14 04:14:13+00:00)
Title: Rebase Fix

I squished my last pull request commits, but the commits after it were applied twice.
This simply rebases to remove the duplication.

![Screen Shot 2012-12-14 at 3 13 32 PM](https://f.cloud.github.com/assets/430277/12589/b4ab7854-45a4-11e2-8115-5a2b598fbb9d.png)