Launch fixes
Merge branch 'master' of github.com:JGrubb/drunken-hearts
MOAR CHANGES