Moved settings to General instead of Permalink due to [#9296](http://core.trac.wordpress.org/ticket/9296)
Merge pull request #1 from scottatron/master

Moved settings from Permalinks to General due to WP #9296