add django/python stuff to path, indent in vim
merge