Reorder some config options
Disable wp 3.7 auto updates
Merge branch 'devel'