Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Fix for content-disposition, or 10 year s3 urls, problem (#1879).

The settings part of this is to move the relevant param above the import
of monkeypatch. The models part is just to stop stripping the url.
Merge branch 'master' of http://github.com/Stanford-Online/class2go into dca_new_working2
Remove remove_querystring function altogether.
remove two unneded imports, was req'd for remove_querystring

No longer need urlparse.urlparse and urlparse.urlunparse.
Merge pull request #2096 from Stanford-Online/dca_new_working2

Fix content disposition (#1879)