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>
Added -h flag to createdb call in README.
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
Fix helios console command to work with Foreman ~> 0.63

Starting from 0.63, foreman has switched to Dotenv instead of
foreman-env.

This patch upgrades the foreman dependency to ~> 0.63, and fixes the
`helios console` command by merging the @env hash with values from
Dotenv::Environment.
Merge pull request #38 from bartvandendriessche/fix_console_for_foreman_0.63

Fix helios console command to work with Foreman ~> 0.63
Removing Gemfil.lock from example
Compacting Rack::Cascade to avoid call to nil

Flattening namespace of Helios::Application
Adding preflight warnings before helios server command
Locking down Zurb and Sinatra-Assetpack to non-broken versions
Bumping version to 0.2.1
Ignore the .sass-cache folder created by the example project
Merge pull request #45 from bartvandendriessche/ignore_example_sass_cache

Ignore the .sass-cache folder created by the example project
Updating Gemfile.lock
Merge branch 'master' of https://github.com/helios-framework/helios
Adding Push Notification sending configuration and endpoint

Signed-off-by: Mattt Thompson <m@mattt.me>
Ignoring example/.env