Wordpress 4.0 Part 2

-Maybe missed some files the first time? Might need to do a reset on the
base install
Merge pull request #1 from chadqueen/dev

Wordpress 4.0 Part 2