MBH: updating gitignore
Merge branch 'master' of github.com:aims-group/acme-site