Add documentation for channels
Merge branch 'socket_doc' of https://github.com/jni-/phoenix into jni--socket_doc
Phoenix.Controller.render shouldn't render a layout when asked not to.
Merge pull request #178 from koudelka/render-no-layout

Phoenix.Controller.render wasn't respecting "layout: nil"
Minor Channel edits
Merge branch 'jni--socket_doc'