Merge remote-tracking branch 'origin/master' into 2013
Update conference configuration.
Fix typo in proceedings config.
Merge branch 'master' into 2013
Merge branch 'master' into 2013
Add emdash and endash.
Merge branch 'master' into 2013
Reworked commit history.  Still need to incorporate reviewer comments.