Shelter allocation, bug fixes.
Bugfix
Merge branch 'master' of https://github.com/flavour/eden into EVASS
Merge branch 'EVASS' of https://github.com/oidualc/eden into EVASS