MBH: updating conference info
Merge branch 'master' of github.com:aims-group/uvcdat-site