Small changes to loader and server.
Merge branch 'pusherserver' of https://github.com/Bradshaw/secret-nemesis into pusherserver