Merge pull request #229 from crawley/datafile-migration

Datafile migration part 3
Merge pull request #238 from crawley/ext-dep-fix-for-travis

Short-term fix to make the Travis builds work on master
Staging test fix
Can't test for staging file off post that triggers async tasks
Test now checks for correct json response (email address of staging user)
path.realpath in test_settings seems unneeded and broke some deployments
removed
Merge branch 'master' into master_3.0_merge
Remove an unnecessary external dependency that breaks travis builds
Try with the old '-v 1.7.0' hack ...
path.realpath in settings_changeme seems unneeded and broke some deployments
removed
Merge pull request #242 from steveandroulakis/3.0_master_merge

3.0 -> Master Merge
Checkpoint of code to handle custom archive organizations
Checkpoint ... organization support mostly working apart from unit tests
Completed the unit test changes, and added some testing for 'tar' format
Added documentation and implemented 'filtering out'.  Also fixed a bug
in the way I was wrapping the mapper functions.
First cut at wiring up the new download stuff to to UI

Conflicts:
	tardis/tardis_portal/templates/tardis_portal/ajax/experiment_description.html

Resolved:
	merged button styling change from master
Documentation tweak
Updated UI for download.  Better "download experiment" button & download selected datasets / datafiles now download in "default" org and archive type
Bug fix download in a dataset

Conflicts:

	tardis/tardis_portal/views.py