In formative note
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher

Conflicts:
	2014-mtmarathon/Makefile.am
apertium translate