Merge pull request #2 from jpalermo/master

Server start command to run on Cloud Foundry
Change Time.now to Time.current, upgrade gems.