Merge branch 'master' into 0.3-beta …

Conflicts:
	ring-core/project.clj
	ring-devel/project.clj
	ring-servlet/project.clj