Cleaned up Django template.
Added Flask template.
Progress errors will now properly display in alerts.
Renamed templates.
Merge branch 'master' of https://github.com/catalyst/basil

Conflicts:
	js/basil.js