Nuku/Flexible-Survival — pull request #477 by TigerStripes (2012-10-14 18:53:58+00:00)
Title: Minor Fixes

Some minor fixes for some of Kaleem's stuff.