Merge pull request #3 from maelstrom/3.6.3-fixes

Support for other file browsers
Do not import from django.conf.urls.defaults

Django 1.5 throws a deprecation warning when you do that