Merge upstream to jeweler

[technicalpickles]

Hi there,

We've had a few emails back and forth, but that hasn't seemed a very effective medium.

Basically, I'd like to see 'jeweler2' merged back into jeweler proper. I'm sure it was forked partially due to not much movement on my part, but I'd like to change that. At the very least, there's duplicated effort now, and it's also confusing to have jeweler and jeweler2 be different gems.

I'm not sure what your intentions for jeweler2, so we'll need to figure that out. Here's how I can be reached:

• technicalpickles on irc.freenode.net (ie #jeweler and elsewhere)
• teknicalpickles on AIM
• [email protected]

Hope to hear from you!