icmc-paper - use DefineShortVerbatim to make inline code easy
Merge branch 'master' of github.com:ModalityTeam/ModalityStuff

Conflicts:
	2014-ICMC/tex/main-icmcModality.tex