Changed Sorcery class to ImageSorcery, as to now conflict with another gem
Bumped version to 1.1, updated gemspec
Fixed merge conflicts