gitignore stuff
merge from webserver changes