updating .gitignore

Conflicts:
	.gitignore
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev
Merge branch 'dev' of github.com:nZEDb/nZEDb into dev