Merge branch 'master' of https://github.com/racker/falcon into patch-2

Conflicts:
	tests/test_req_vars.py
Merge branch 'patch-2' of https://github.com/xiaclo/falcon into patch-2