RR: settings_deploy.py excluded.

Change-Id: Ia802e3cc0909e33b67ee8e33bd161ff18f95233e
Reorganised project so the database will be initialised with reference data.
Reverted change to langstroth/views.py Version 2.
Change allocations.py to reduce variable usage.
Logging improved.
Some style improvements.
Added filtering for all null FOR codes.
Applied flanke8 recommendations.

Change-Id: I6f73a8f000fdaed8e746a94b7c29648d77a8e695
Merge branch 'master' of https://github.com/NeCTAR-RC/langstroth into allocation_requests

Conflicts:
	.gitignore
	langstroth/defaults.py
	langstroth/settings_test.py
	langstroth/static/css/allocation-visualisation.css
	langstroth/static/css/master-detail.css
	langstroth/static/js/allocations_pie.js
	langstroth/static/js/for_table.js
	langstroth/static/js/project_allocations.js
	langstroth/static/js/project_details.js
	langstroth/templates/base.html
	langstroth/urls.py
	langstroth/views.py
	nectar_allocations/fixtures/allocation_requests.json
	nectar_allocations/fixtures/for_codes.nectar_allocations.json
	nectar_allocations/models/allocation.py
	nectar_allocations/models/forcode.py
	nectar_allocations/router.py
	nectar_allocations/router_for_testing.py
	nectar_allocations/templates/allocation_visualisation.html
	nectar_allocations/templates/project_allocations.html
	nectar_allocations/templates/project_details.html
	nectar_allocations/tests/test_allocation.py
	nectar_allocations/tests/test_db_allocation.py
	nectar_allocations/tests/test_db_forcode.py
	nectar_allocations/tests/test_view.py
	nectar_allocations/urls.py
	nectar_allocations/views.py
	run_tests.sh
	setup.py

Change-Id: Ic599efa7a52a4dc89f6711e8874376ba4637b41d
Code review/Flake8 changes.
Merge commit 'a77b28c' into allocation_requests

Conflicts:
	.gitignore
	README.rst
	langstroth/static/css/allocation-visualisation.css
	langstroth/static/css/master-detail.css
	langstroth/static/js/allocations_pie.js
	langstroth/static/js/for_table.js
	langstroth/static/js/project_allocations.js
	langstroth/static/js/project_details.js
	langstroth/templates/base.html
	nectar_allocations/fixtures/allocation_requests.json
	nectar_allocations/fixtures/for_codes.nectar_allocations.json
	nectar_allocations/models/__init__.py
	nectar_allocations/models/allocation.py
	nectar_allocations/models/forcode.py
	nectar_allocations/reference_data/initial_data.json
	nectar_allocations/router.py
	nectar_allocations/router_for_testing.py
	nectar_allocations/templates/allocation_visualisation.html
	nectar_allocations/templates/project_allocations.html
	nectar_allocations/templates/project_details.html
	nectar_allocations/tests/__init__.py
	nectar_allocations/tests/test_allocation.py
	nectar_allocations/tests/test_db_allocation.py
	nectar_allocations/tests/test_db_forcode.py
	nectar_allocations/tests/test_forcode.py
	nectar_allocations/tests/test_view.py
	nectar_allocations/urls.py
	nectar_allocations/views.py
	run_tests.sh
	utilities/file.py

Change-Id: I601607da07a32077909a50c3fc8b6d77785bfa3c
File exclusions update.

Change-Id: Ifc25c2d62f3a37ddd1301f0713fe5bf120ded570
Trying to fix white space in the tempaltes.

Change-Id: Ie2ccf5eff9ead5aff3904409e9fb4035f5c8b4be
Fixed spelling error.

Change-Id: Icb309e8c9082af49496e195f84a432558cfb592e
Merge branch 'master' of https://github.com/NeCTAR-RC/langstroth into allocation_requests

Conflicts:
	nectar_allocations/models/allocation.py
	nectar_allocations/router.py
	nectar_allocations/router_for_testing.py
	nectar_allocations/tests/test_allocation.py
	nectar_allocations/tests/test_db_allocation.py
	utilities/file.py

Change-Id: If383c4bcb1a8161d3aa8a421c88f1a72c84c04dd
Merge branch 'allocation_requests'

Conflicts:
	nectar_allocations/tests/test_view.py

Change-Id: I8ffb63e679fc6db45c9d7e157e5ef2b584d7dbcd