Fixed up code style to only use 80 chars/line

Also ensured consistent 3-space tabs.
Merge remote branch 'upstream/master' into 80chars

Conflicts:
	climateanalyser/admin.py
	climateanalyser/urls.py
	static/climateanalyser/js/computationdataform.js
	zooadapter/models.py
Merge pull request #12 from Andrew-Dunn/80chars

Fixed up code to only use 80 chars/line