remove jetpack, add resque
Merge remote-tracking branch 'origin/master'