update required Elixir version in README to reflect actual required version
Merge pull request #140 from lau/elixir_0_2_14_comp

update required Elixir version in README to reflect actual required version
Remove Parsers.Fallback and fix unused alias
Update bootstrap template versions
Update README.md
Remove uncessary path_info work at dispatch time
Merge branch 'master' of github.com:chrismccord/phoenix
Create query strings when constructing paths from routes.
Merge pull request #120 from koudelka/query-strings-in-paths

Create query strings when constructing paths from routes.
Add @external_resource to fix auto recompilation of templates for 0.14.2
Merge branch 'master' of github.com:chrismccord/phoenix
Require channel broadcastings to use maps instead of arbitray dicts for proper JSON conversion
Change controller action arity by passing params map as second argument
Add changelog and bump version
Update readme with new controller action arity
Fix spelling
Merge pull request #141 from jimt/patch-1

Fix spelling