Restore functionality by removing extraneous return
Generate asset urls with a function
Add asset prefix to create args
Remove unecessary code path
Factor out duplication in url joining functions
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
Generate service pages for those with detailed view
Merge branch 'fix-volume-magnitude' into generate-service-details

Conflicts:
	test/filters/test_filters.py
Render all detail pages from detailed pages column
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
Get attribute as accessor rather than getattr
Merge pull request #42 from alphagov/generate-service-details

Generate service details
Merge branch 'master' into fixing-value-change

Conflicts:
	test/service/test_service.py