prevent need to symlink settings.py
Merge branch 'fix-symlinks'