Merge branch 'heroku'
Merge branch 'heroku'
sidekiq tweaking
Merge branch 'heroku'
changes to .gitignore to allow for sidekiq pids directory to export
Merge branch 'heroku'
more changes to .gitignore to allow public/user directories to upload
deleated empty content files
seeded the public/user_content directory
Merge branch 'heroku'
required ruby 1.9.3 in Gemfile
moved server_path public to tmp to comply with heroku
Merge pull request #5 from seanot/heroku

Heroku