A touch of formatting
Merge branch 'patch-1' of git://github.com/jroes/helios into jroes-patch-1

Conflicts:
	README.md

Signed-off-by: Mattt Thompson <m@mattt.me>
Loading existing routes when using helios as a middleware
[Issue #32] Updating Haml dependency for greater compatibility
Merge branch 'master' of git://github.com/mtitolo/helios into mtitolo-master

Conflicts:
	README.md
[Issue #36] Removing gem install from Rakefile