Initial Tox configuration

Change-Id: I6bd4ce867386a93e490e82b97f755b42a5725154
Revert "Initial Tox configuration"

This reverts commit 969ae1a4dac305785b5c469476812a6677f7badd.

Change-Id: I29c06988cb634e0bae0d9e100035c0afcac945a7
Don't error if nagios can't be contacted

Change-Id: I84f40bb3a3ed57b760c6bfee125f2e9987a043b6
Allocation system browser

Initial implementation of the allocation system browser.

Change-Id: I6f73a8f000fdaed8e746a94b7c29648d77a8e695
Style cleanup

Change-Id: I10f984a3b2594a1d1a4e98d637f5dcc0e1a8dc5b
Updated tox configuration moved to py.test

Change-Id: I5561cea7b51db3627e70b5cf1f522127c5d739f5
Added support for Ceilometer, Accounts

The fixture has been updated with a newer copy from production.

Change-Id: Ia094bbc781cf76f06c564c9313dbd4253413cc74
Merged upstream into master.
Merge branch 'master' of https://github.com/NeCTAR-RC/langstroth

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: I9abe0ea8d548dc5f683a3530fc3fea001ff2ef2a