Further tidy up of test_edw_sync
Added missing collumn to dataset upgrade.
Whitespace cleanup.
Set types for upgrade.
Removed extra line.
Resolved merge conflict of treatment upgrades.
Merge pull request #209 from ENCODE-DCC/dbxref_fix-1290

Added missing collumn to dataset upgrade. #1290
Fixed flake8 issues.
Remove stray file
Merge pull request #210 from ENCODE-DCC/remove_award_fix-1182

Remove award fix #1182
Work around bug where edit was being rejected with Precondition Failed on Apache 2.4
Make bin/upgrade work with batching.
Elasticsearch 1.1 for AWS
Allow login via https as well as http
Added tests for multi-faceting and search
Merge pull request #211 from ENCODE-DCC/448_tests

Added tests for multi-faceting and search
Merge in origin/master
Added RBNS_protein_concentration display to Experiment display
Fixed a bug
Apache redirect config (include separately for production.)