Remove error handling from router and dispatcher client
Add Phoenix.Plugs.ErrorHandler
Merge pull request #53 from nurugger07/merge_router_options

Router.Options to abstract merging router options
Remove dispatcher
Fixup spelling oddities
Merge pull request #56 from scrogson/master

Fixup spelling oddities
Merge branch 'remove_dispatcher' of github.com:HashNuke/phoenix into HashNuke-remove_dispatcher
Resolve merge conflicts and move error rendering to controller
Add calliope dependency to render haml templates
Render basic haml through controller
Pass arguments to haml template
Update out-of-date code