Nuku/Flexible-Survival — pull request #653 by TigerStripes (2013-02-28 17:30:59+00:00)
Title: Fixes

Missed the Elijah content.
Small fixes and tweaks for Bouncy Castle addition.