get rich ready for mongoid
all changes from keithpops merged