added dependencies for Heroku Cedar
Merge branch 'master' of github.com:afeld/magickly into cedar

* 'master' of github.com:afeld/magickly:
  added v1.3.0 release notes
  Version bump to 1.3.0
  added new items to HISTORY
updated daemons gem
Merge branch 'master' of github.com:afeld/magickly into cedar

* 'master' of github.com:afeld/magickly:
  removed executable from gemspec
added newrelic config file
Merge branch 'master' into cedar

Conflicts:
	Gemfile
	Gemfile.lock
remove sinatra-synchrony
lock Dragonfly at higher version for security upgrade; upgrade gems
Merge branch 'master' into cedar

Conflicts:
	Gemfile
	Gemfile.lock
/q/ requests can stack processing directives
Merge pull request #17 from jcn/qstacked

/q/ requests can stack processing directives
add jruby to travis build - closes #13
upgrade gems
regenerate gemspec
use gemspec to manage gem versions
clean up gemspec
make separate CONTRIBUTING file
re-add newrelic gem to gemfile
Merge branch 'master' into cedar

Conflicts:
	Gemfile
	Gemfile.lock
move development/test dependencies back to gemfile