ASE: update to ASE 3.2.0.1121
ASE: update to 3.2.0.1121 also removes three files
ASE: update to ASE 3.3.1.1390
ASE: update to ASE 3.4.0.1574
ASE: update from ASE 3.4.0.1574 to ASE 3.4.1.1765
ASE: rm stray directory darcs_testing_for_nfs
ASE: update from 3.4.1.1765 to 3.5.1.2175
ASE: update from 3.5.1.2175 to 3.6.0.2515
GIT: add .gitignore
ASE: update from 3.6.0.2515 to 3.7.0.3168
ASE: update from 3.7.0.3168 to 3.7.1.3184
Merge commit 'c9357b2efc89b2f25f5952e862348c8ce886828d'

This is a formal merge to glue two branches. The local version was extended and
updated over time to 3.7.1.3184 merging our local changes over time.  This is
why the conflicts were resolved in favor of the master branch.

Conflicts:
	ase/atoms.py
	ase/calculators/general.py
	ase/calculators/turbomole.py
	ase/calculators/vasp.py
	ase/constraints.py
	ase/io/__init__.py
	ase/optimize/__init__.py