Update controller layer to be Plug based
Match on :throw and return current conn state
Add Controller plug tests and fix double plugging of :action
Update controller layer to be Plug based
Match on :throw and return current conn state
Add Controller plug tests and fix double plugging of :action
Merge branch 'cm/controller-plugs' of github.com:chrismccord/phoenix into cm/controller-plugs
Use put_in for params merge
Add Controller.Connection and refactor pre-action into Plugs.
Add Accepts plug
Enchance Logger Plug
Improve docs
Add Plugs.Accepts tests
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