various
Merge branch 'master' of github.com:holderdeord/hdo-proposition-cleanup

Conflicts:
	Rakefile