Fixed #14 environment variable conflict with sinatra reserved word
Merge branch 'dmyers-env-conflict', fixes #24