cleanups
updates
Merge branch 'master' of github.com:Vanaheimr/Odin

Conflicts:
	Vanaheimr/Jurassic