About page.
Merge branch 'master' into about-and-home-pages

Conflicts:
	create_pages.py
	templates/base.html
Only generate pages if create_page.py is called directly

-   This will prevent pages getting generated if someone
    imports create pages for any reason.
Render about page when create_pages is used
Add home page html - needs to be made dynamic
Merge branch 'master' into about-and-home-pages

Conflicts:
	.gitignore
	create_pages.py
Generate homepage headlines from data
Add header, footer to home page, fix nav links
use EXPLORER_HOST variable for base url
Serve up local assets with correct content types
Create data directory if it does not exist

On jenkins the credentials are taken from the system so there is no data
directory.
Rename aboutData to about-data
Merge branch 'about-and-home-pages' of github.com:alphagov/service-explorer into about-and-home-pages
Merge branch 'master' into about-and-home-pages

Conflicts:
	create_pages.py
Fix tar command to zip rather than unzip
Merge pull request #11 from alphagov/about-and-home-pages

About and home pages
Merge pull request #17 from alphagov/fix-tar-command

Fix tar command to zip rather than unzip
Merge pull request #15 from alphagov/create-data-directory

Create data directory if it does not exist
Merge branch 'master' into csv_data

Conflicts:
	create_pages.py
Change services number in test