Merge pull request #52 from ibroadfo/patch-1

mark step definitions as ruby code
Adds EventMachine timeout configuration

On my current Rails project, we're faced with a particularly slow asset
compilation step. This has led to us having flakey tests, as our Puffing
Billy tests using the selenium_billy driver often timeout when compiling
assets. It'd be nice to be able to change the configuration for the
EventMachine::HttpRequest that the proxy handler uses so that we can
safely deal with slow requests.
Merge pull request #57 from mjstallard/eventmachine_config

Adds EventMachine timeout configuration
Merge branch 'master' into dynamic-jsonp-with-params

Conflicts:
	lib/billy/config.rb
Add documentation for c.dynamic_jsonp_keys