Final pre-ship layout
Merge branch 'master' of https://github.com/Dewb/CosmicPraise