added procfile for sidekiq
fixed merge conflicts
fixed misc fields
Merge pull request #9 from hzla00/ken

cosmetic changes
final changes