Switch to nozzle, cleanup Gemfile, some fixes
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
get rid of CW legacy
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
switch to released nozzle, make thumbnails work
fast fix
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
use Shellwords to escape command line arguments
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle

Conflicts:
	app/views/elements/FormsFormIndirect/_core.slim
Merge branch 'master' into nozzle

Conflicts was:
	app/app.rb
	lib/monkey.rb
Merge branch 'master' into nozzle

Conflicts:
	lib/dm-swift.rb
	lib/swift/carrierwave.rb
Merge branch 'master' into nozzle
Merge branch 'master' into nozzle
[BUNDLE] update nozzle, relax dm-core, help MultiJson to serialize