Remove global ref to in-flight
Merge branch 'v0.12'
Make Controllers EventEmitters
Remove in-flight stuff from logging
Better handling of request timeouts
Default value for request timeout (null)
Version 0.12.13
Merge branch 'v0.12'

Conflicts:
	lib/controller/base_controller.js
Major version bump
Updated deps
Removed ref to loadedAdapters
Version 0.12.14
Duh, remove timeout when done
Version 0.12.15
Merge branch 'v0.12' into v13

Conflicts:
	package.json
Merge branch 'master' of github.com:geddy/geddy