Do some Moses.Optimize
Merge branch 'master' of github.com:flammie/purplemonkeydishwasher

Conflicts:
	2014-mtmarathon/configure.ac
Include both