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'
Remove ExConf and refactor Phoenix.Config to use Mix config
Fix typo
Merge pull request #181 from benjamintanweihao/patch-1

Fix typo
Fix use Phoenix.Channel

`Phoenix.Channels` should be `Phoenix.Channel` instead.
Merge pull request #182 from benjamintanweihao/patch-1

Fix use Phoenix.Channel
Improve Config docs and defaults
Allow Plug.Parsers and Error handler plug to be configured
Update template to support new Mix config
Add template config
Merge branch 'master' of github.com:chrismccord/phoenix