Merge pull request #1 from pagodabox/master

Updating forked master, before bringing WordPress up to date.
Bringing WordPress to 3.9.1
Merge pull request #13 from michaelryanmcneill/master

Bringing WordPress to 3.9.1