Fixed that darn "oh god why is there 2 4 8 16 of everything" bug

Also made restarting the game smooooooooth
Merge branch 'master' of https://github.com/jbmorse/Dragonfly