Merge pull request #1 from dwaynemac/master

Payment Types by dwaynemac
dont use a worker for resque (for now)
fix unicorn for heroku
Merge pull request #1 from lperichon/master

update repo