Add updated workshop schedule
Update venues macros for 2013 program
Merge branch 'master' of github.com:hausdorff/acl-conf-handbook

Conflicts:
	content/setup/venues.tex
	content/workshops/overview-thursday.tex
	content/workshops/overview.tex
	content/workshops/workshops.tex
Add emacs tmp files to .gitignore