PEP8 cleanup
Removed trailing whitespace
Fixed javascript syntax errors in base.html
Merge branch 'master' into feature/blogs

Conflicts:
	wagtailsite/models.py
	wagtailsite/templates/wagtailsite/blog_index_page.html
	wagtailsite/templates/wagtailsite/blog_page.html
General cleanup