Cleaned up bad imports. Fixes #544
Fixed some references to the bad imports
Make register_snippet usable as a decorator
Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out

The tests attempted to skip themselves when WAGTAILSEARCH_BACKENDS was
not filled out, but the skip code was throwing an error, causing the
test to fail.
Merge pull request #642 from takeflight/bug/failing-tests-613

Fix failing tests when WAGTAILSEARCH_BACKENDS not filled out
Merge pull request #639 from jalourenco/master

wagtail 0.6.0 pt_PT localization
Added contributor entry for #639
release note for #641
Merge branch 'takeflight-feature/register-snippet-decorator'
Merge branch 'master' of github.com:torchbox/wagtail
Merge remote-tracking branch 'torchbox/master' into bad-imports-cleanup

Conflicts:
	wagtail/wagtailembeds/__init__.py
	wagtail/wagtailsearch/__init__.py
Merge pull request #561 from kaedroho/bad-imports-cleanup

Cleaned up bad imports. Fixes #544
Update CONTRIBUTORS.rst
Merge pull request #3 from torchbox/master

Update on 20140918