Add :none option for layout instead of nil assign
Return {:ok, pid} from Router.start_adapter
Update Plug & cowboy deps
Use new plug :eaddrinuse error
Add conn to the template assigns when rendering in controller. Close #230
Unify View rendering across controllers/views, and remove within macro
Allow local renders within templates an unwrap from View.render/3 per #148
Bump docs
Add proper documentation to template/config.exs. Close #231
Auto plug Plug.Static at / and allow static assets to be configurable. Close #183
Update Html Engine for 0.15.0
Merge branch 'cm/rendering-refactor'
Add Phoenix.Template.Engine behaviour
Remove HamlEngine and add docs for PhoenixHaml hex dependency
Bump travis
Move render/2 into engine to abide by Template.Engine behaviour
Fix references to old View module names in README
Merge pull request #232 from lsimoneau/readme-fixes

Fix references to old View module names in README
Update phoenix_haml and linguist for 0.15.0
Merge branch 'master' of github.com:chrismccord/phoenix