try and merge with Simon
update .gitignore to ignore distutils stuff