Rename as_absolute_path to as_absolute_url
Generate asset urls with a function
Fix tests
Merge branch 'master' into rename-as-absolute-path

Conflicts:
	templates/base.html
Add department title in abbr tag to high vol page
Add asset prefix to create args
Factor out duplication in url joining functions
Merge pull request #38 from alphagov/rename-as-absolute-path

Rename as_absolute_path to as_absolute_url
Merge pull request #40 from alphagov/high-volume-dept-tooltip

Add department title in abbr tag to high volume page
Merge branch 'master' into serve-assets-with-static

Conflicts:
	lib/filters/__init__.py
	lib/templates/__init__.py
	templates/base.html
	test/filters/test_filters.py
Merge branch 'master' into fix-volume-magnitude

Conflicts:
	test/filters/test_filters.py
Use isinstace basestring instead of type

It is the recommended way of checking if a variable is a string.
Merge pull request #37 from alphagov/fix-volume-magnitude

Restore functionality by removing extraneous return
Merge branch 'master' into serve-assets-with-static

Conflicts:
	lib/filters/__init__.py
	test/filters/test_filters.py
Merge pull request #41 from alphagov/serve-assets-with-static

Serve assets with static
Merge branch 'master' into generate-service-details

Conflicts:
	lib/filters/__init__.py
	templates/department.html
	test/filters/test_filters.py