adding custom img attrs to image_tags, but no custom TestCasecreated for it
typo
Added wagtail and django settings doc

more settings stuffs

settings stuff

settings stuff

so many things

omg is it really two AM

More docs
Settings doc changes based on feedback
get_page_types no longer required in wagtailadmin.views.pages
Check that the content type passed to wagtailadmin.pages.create is valid according to subpage_types
Make can_add_subpage and can_publish_subpage permission checks return False for page models that disallow subpages; this ensures that 'add child page' links are not shown
Bypass 'choose a page type' screen when there is only one available choice in subpage_types
Add unit tests for edit_handlers.py. Lint edit_handlers.py.
Merge branch 'master' into edit-handlers-unit-tests

Conflicts:
	wagtail/wagtailadmin/edit_handlers.py
Remove broken test
Update edit handlers unit tests

Add more tests. Clean up modified class properties after tests finish.
Replace assertRegexpMatches with assertIn.
Merge branch 'feature/image_tag_attrs' of https://github.com/sixpearls/wagtail into sixpearls-feature/image_tag_attrs -
Update img_tag to output extra attributes through format_html_join rather than a template.
Conflicts:
	wagtail/wagtailimages/models.py
Refactor image tag parser so that it only has two cases to handle
Add unit test for image tag with extra attributes
Merge branch 'sixpearls-feature/image_tag_attrs'
changelog entry for #294
Merge branch 'master' into edit-handlers-unit-tests
Scrapped ElasticUtils, use Elasticsearch-py instead

Conflicts:
	wagtail/wagtailsearch/backends/elasticsearch.py
	wagtail/wagtailsearch/indexed.py
New ElasticSearch module now supports bulk insert