first attack of ioc macro support for alt
Merge branch 'master' of http://github.com/clojure/core.async

Conflicts:
	src/clj/core/async.clj