Pull latest changes to stay in sync

This is what I get for being lazy. "This pull request is big! We're only showing the most recent 1,000 commits."
![screen shot 2013-05-12 at 4 20 53 pm](https://f.cloud.github.com/assets/1676445/493497/de3a4d56-bb49-11e2-948b-f695be45a208.png)