added mpath where necessary, removed settings.py from ignore