gitignore update
setup update
prepared for django 1.6