Add .gitignore file to project root
Bringing in last patch from svn
Merge branch 'master' into search_fix