#1312 small code refactor to be able to change logic and started implementing new state
#1312 More refactor, code now handles enqueuing if config active
#1312 Mostly done, flow working and just pending error handling
#1312
Merge branch 'master' into issue-1312

Conflicts:
	NEWS.md
#1312
Merge branch 'master' into issue-1312

Conflicts:
	app/models/data_import.rb
Merge branch 'master' into issue-1312

Conflicts:
	NEWS.md
Merge branch 'master' into issue-1312

Conflicts:
	NEWS.md
Merge pull request #1531 from CartoDB/issue-1312

Uploads from Rails to storage backend (S3) of big files timeout