Added optional media_dir to set_media_permissions()

:param media_dir: Optional dir underneath code_path if media does not live in
        ``<code_path>/django_project/media``. No trailing slash.
Added optional media_dir to setup_apache()

:param media_dir: Optional dir under code_path if media does not live in 
        ``<code_path>/django_project/media``. No trailing slash.
    :type medi_dir: str

This is required to pass to set_media_permissions(). Perhaps the better solution might be to remove the call to set_media_permissions() from setup_apache()?
Merge pull request #1 from Erve1879/patch-1

Patch 1
Merge pull request #2 from Erve1879/patch-2

Added optional media_dir to setup_apache()
Fixed arg/kwarg order
Fixed arg/kwarg order
Fixed arg/kwarg order
Merge branch 'master' into patch
Fixed erroneous media_path reference in set_media_permissions()
Corrected medi_dir in setup_apache() doc strings
Merge pull request #8 from Erve1879/patch

Added optional media_dir to setup_apache() and set_media_permissions()