Add calliope dependency to render haml templates
Render basic haml through controller
Pass arguments to haml template
Merge branch 'master' into render_haml_with_calliope
Merge remote-tracking branch 'johnny/render_haml_with_calliope' into render_haml_with_calliope

Conflicts:
	[resolved] mix.exs
	[resolved] test/phoenix/controller_test.exs
Fix haml rendering with latest calliope
Merge pull request #1 from knewter/render_haml_with_calliope

Render haml with calliope