Defining uploads dir
Merge branch 'master' into restructure_uploads
Updated wp-config.php to set uploads dir outside of wp-content