made curl timeout an optionally configurable parameter
support not rails app for determining environment
manual merge