upgraded Dragonfly
update httparty to 0.8.1 and run bundle update
comment out configuration of log_commands as it's no longer supported
by dragonfly
updated gems
added 1.9.3 to tests
updated gems
use analyser_methods from Dragonfly
regenerate gemspec
Version bump to 1.2.1
Regenerate gemspec for version 1.2.1
add history for v1.2.1
Stop passing cookie strings onto subsequent requests
support cloudfront-compatible /q/* urls where what was the query
string is written as a path (?, & and = become /)
unescape the src again if %2F appears in it
Merge remote-tracking branch 'tolsen/1.2.x' into 1.2.x
Revert "backwards compatibility with Ruby 1.8.x by not requiring sinatra-synchrony in those cases"

This reverts commit eaa679c707a3f6df36b5420ee8234118b3456d60.
Revert "running on sinatra-synchrony"

This reverts commit 6161fd6461ad54130a43cf1bd80c0ad31c433e82.

Conflicts:

	Gemfile.lock
Merge branch '1.2.x'

Conflicts:
	Gemfile
	Gemfile.lock
	HISTORY.md
	VERSION
	lib/magickly.rb
	lib/magickly/app.rb
	spec/requests/magickly_app_spec.rb
added alternate syntax description to README, and new entries to HISTORY
added JCN effect