Pull updates from interal REPO

Includes rails3 upgrade, reduced dependencies, rewritten importers,