Update .gitignore
Moved queryserv sql to svn so I can more easily have a git section without confusion
Merge remote-tracking branch 'upstream/master'