add wsgi and runserver to gitignore
stuff
fix merge conflicts