add unicorn tasks
Merge branch 'master' of github.com:john-denisov/captest

Conflicts:
	config/deploy.rb