2013-12-21-0102

More modular changes
Merge branch 'master' of https://github.com/Nmarb/Survive