use "start|stop\ on runlevel [x]" for upstart config
add circus support
Add MIT license text
Prevent upstart export from deleting similarly named upstart files
Remove tmux option from man page

Not well supported at this time. See issue #242
Update man/foreman.1

fix man example typo: Procfile flag is `-f`, not `-p`
Permit underscore for command name in Procfile.
Fixed specs to pass.
[foreman-runner] fix sourcing as . is rarely in PATH
Replace Foreman::Env with dotenv
remove posix-spawn dependency as it does not work in jruby 1.7.3
Revert "Ensure foreman is the process group leader"

This reverts commit 44726e377efe80efee40260fea7280f2f91097f4.

Conflicts:

	lib/foreman/engine.rb
Merge pull request #352 from john-griffin/master

Restore ability to trap crtl+c
Merge pull request #266 from messick/master

Use runlevels in upstart config so app starts after boot in Ubuntu 12.03
Merge pull request #292 from andrewsmedina/master

circus support
Merge pull request #323 from dplummer/remove-tmux-from-man

Remove tmux option from man page
Merge pull request #329 from kentaro/permit-underscore-in-procfile

Permit hyphen for command name in Procfile
Merge pull request #347 from bkeepers/dotenv

Replace Foreman::Env with dotenv
Merge pull request #351 from GreenplumChorus/master

Remove posix-spawn dependency for JRuby
Merge pull request #326 from pje/patch-1

Update man/foreman.1