added path to gitignore
Merge branch 'upstream'

Conflicts:
	pymol/modules/pymol2/cmd2.py
Merge branch 'master' of https://bitbucket.org/evonove/pymol
Merge branch 'master' into HEAD