capistrano
Merge branch 'master' into develop
fuzzieness
added text_pattern_ops migration
added comment
Merge branch 'master' into develop
delayed_paperclip modified for good
redis cleared
mass uploads suck
blupill rbenv
bluepill rbenv
rbenv for consoles
test suite fix
probably fixes workers being slow
add arcane (but still not entirely working)
fix test suite
Merge branch 'feature-arcane' into feature-relayout

Conflicts:
	Gemfile.lock
Merge branch 'develop' into feature-relayout
fix Gemfile.lock