Server changes for cloud deployment
Merge pull request #41 from areagray/master

Server changes for cloud deployment